From 84619cc27f76d41ce00733c6151940076a271b45 Mon Sep 17 00:00:00 2001
From: ssyang1993 <1017795527@qq.com>
Date: Thu, 1 Jul 2021 09:30:37 +0800
Subject: [PATCH 1/3] =?UTF-8?q?1.=20=E6=B2=A1=E6=9C=89=E9=80=80=E6=AC=BE?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E5=88=99=E6=B7=BB=E5=8A=A0=E5=8D=A0?=
 =?UTF-8?q?=E4=BD=8D=E7=AC=A6=EF=BC=8C=E4=BD=BF=E8=AF=A6=E6=83=85=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=B7=A6=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeepay-ui-manager/src/views/order/pay/PayOrderList.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
index 9358a08..f3191af 100644
--- a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
@@ -89,6 +89,8 @@
           <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>
+            <!-- 占位用按钮，判断条件为 record.state !== 2 -->
+            <a-button type="link" v-show="(record.state !== 2)" style="width:60px"></a-button>
           </JeepayTableColumns>
         </template>
       </JeepayTable>

From 8fa35952f97bb515632b0c9c3ac28143115b6708 Mon Sep 17 00:00:00 2001
From: ssyang1993 <1017795527@qq.com>
Date: Fri, 2 Jul 2021 10:01:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?1.=20=E8=A7=A3=E5=86=B3=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E5=9B=A0=E9=87=8D=E5=A4=8D=20key=20?=
 =?UTF-8?q?=E4=BA=A7=E7=94=9F=E7=9A=84=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeepay-ui-manager/src/views/mchApp/List.vue | 2 +-
 jeepay-ui-manager/vue.config.js             | 1 +
 jeepay-ui-merchant/vue.config.js            | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jeepay-ui-manager/src/views/mchApp/List.vue b/jeepay-ui-manager/src/views/mchApp/List.vue
index 9c12dc7..60dbe1b 100644
--- a/jeepay-ui-manager/src/views/mchApp/List.vue
+++ b/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>
diff --git a/jeepay-ui-manager/vue.config.js b/jeepay-ui-manager/vue.config.js
index c0207d8..74a884e 100644
--- a/jeepay-ui-manager/vue.config.js
+++ b/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]'
       })
 
diff --git a/jeepay-ui-merchant/vue.config.js b/jeepay-ui-merchant/vue.config.js
index 3f97d9b..68951b6 100644
--- a/jeepay-ui-merchant/vue.config.js
+++ b/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]'
       })
 

From 237f1e082e6e0c0b76782c0f5300934e207ca006 Mon Sep 17 00:00:00 2001
From: ssyang1993 <1017795527@qq.com>
Date: Fri, 2 Jul 2021 17:31:15 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=20=E8=8B=A5=E6=97=A0=E5=8F=AF=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E9=87=91=E9=A2=9D=EF=BC=8C=E5=88=99=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=80=E6=AC=BE=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeepay-ui-manager/src/views/order/pay/PayOrderList.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
index f3191af..d38fad2 100644
--- a/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
+++ b/jeepay-ui-manager/src/views/order/pay/PayOrderList.vue
@@ -88,9 +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>
-            <!-- 占位用按钮，判断条件为 record.state !== 2 -->
-            <a-button type="link" v-show="(record.state !== 2)" style="width:60px"></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>