Merge remote-tracking branch 'origin/dev' into dev

jeepay-ui-manager/src/views/mchApp/List.vue

@@ -35,7 +35,7 @@
         :tableColumns="tableColumns"
         :searchData="searchData"
         :scrollX="1200"
-        rowKey="mchName"
+        rowKey="appId"
       >
         <template slot="appIdSlot" slot-scope="{record}">
           <b>{{ record.appId }}</b>

jeepay-ui-manager/src/views/order/pay/PayOrderList.vue

@@ -88,7 +88,8 @@
         <template slot="opSlot" slot-scope="{record}">  <!-- 操作列插槽 -->
           <JeepayTableColumns>
             <a-button type="link" v-if="$access('ENT_PAY_ORDER_VIEW')" @click="detailFunc(record.payOrderId)">详情</a-button>
-            <a-button type="link" v-if="$access('ENT_PAY_ORDER_REFUND')" style="color: red" v-show="(record.state === 2)" @click="openFunc(record, record.payOrderId)">退款</a-button>
+
+            <a-button type="link" v-if="$access('ENT_PAY_ORDER_REFUND')" style="color: red" v-show="(record.state === 2 && record.refundState !== 2)" @click="openFunc(record, record.payOrderId)">退款</a-button>
           </JeepayTableColumns>
         </template>
       </JeepayTable>

jeepay-ui-manager/vue.config.js

@@ -71,6 +71,7 @@ const vueConfig = {
       .use('file-loader')
       .loader('file-loader')
       .options({
+        limit: 100000,
         name: 'assets/[name].[hash:8].[ext]'
       })
 

jeepay-ui-merchant/vue.config.js

@@ -74,6 +74,7 @@ const vueConfig = {
       .use('file-loader')
       .loader('file-loader')
       .options({
+        limit: 100000,
         name: 'assets/[name].[hash:8].[ext]'
       })