Merge branch 'master' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_vue_store

src/common/enum/payment/Method.js

@@ -7,5 +7,6 @@ import Enum from '../enum'
 export default new Enum([
   { key: 'WECHAT', name: '微信支付', value: 'wechat' },
   { key: 'ALIPAY', name: '支付宝', value: 'alipay' },
-  { key: 'BALANCE', name: '余额支付', value: 'balance' }
+  { key: 'BALANCE', name: '余额支付', value: 'balance' },
+  { key: 'HUIFU', name: '银联支付', value: 'huifu' }
 ])

src/common/enum/setting/payment/Method.js

@@ -8,5 +8,5 @@ export default new Enum([
   { key: 'WECHAT', name: '微信支付', value: 'wechat' },
   { key: 'ALIPAY', name: '支付宝', value: 'alipay' },
   { key: 'BALANCE', name: '余额支付', value: 'balance' },
-  { key: 'HUIFU', name: '汇支付', value: 'huifu' }
+  { key: 'HUIFU', name: '银联支付', value: 'huifu' }
 ])

src/views/setting/payment/Setting.vue

@@ -18,7 +18,8 @@
           <!-- 支付方式 -->
           <template slot="method" slot-scope="text">
             <div class="pay-method-item">
-              <span class="pay-icon" :style="{ color: PayMethodIcons[text].color }">
+              <img v-if="text==='huifu'" src="/static/yinlian.png" class="huifu-img">
+              <span v-else class="pay-icon" :style="{ color: PayMethodIcons[text].color }">
                 <a-icon class="icon" :class="[text]" :component="PayMethodIcons[text].icon" />
               </span>
               <span>{{ PaymentMethodEnum[text].name }}</span>
@@ -283,9 +284,13 @@ export default {
   .pay-method-item {
     display: flex;
     align-items: center;
+    .huifu-img {
+      height: 20px;
+      margin-right: 4px;
+    }
     .pay-icon {
       font-size: 24px;
-      margin-right: 8px;
+      margin-right: 12px;
     }
   }