From 5fd8a949fc42a114694436a47dcdf0fb31a271d7 Mon Sep 17 00:00:00 2001
From: ssyang1993 <1017795527@qq.com>
Date: Thu, 24 Jun 2021 17:55:22 +0800
Subject: [PATCH] =?UTF-8?q?1=20.=20=E5=BA=94=E7=94=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E6=93=8D=E4=BD=9C=E6=9D=BF=E5=9D=97=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8C=89=E9=92=AE=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeepay-ui-merchant/src/global.less           | 2 +-
 jeepay-ui-merchant/src/views/mchApp/List.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jeepay-ui-merchant/src/global.less b/jeepay-ui-merchant/src/global.less
index 6075097..6a3f80d 100644
--- a/jeepay-ui-merchant/src/global.less
+++ b/jeepay-ui-merchant/src/global.less
@@ -266,7 +266,7 @@ ol {
 }
 // 增加内容区域的边框圆角
 .ant-card {
-  border-radius: 10px;
+  border-radius: 10px !important;
   overflow: hidden;
 }
 
diff --git a/jeepay-ui-merchant/src/views/mchApp/List.vue b/jeepay-ui-merchant/src/views/mchApp/List.vue
index 0c87cd8..ae5f564 100644
--- a/jeepay-ui-merchant/src/views/mchApp/List.vue
+++ b/jeepay-ui-merchant/src/views/mchApp/List.vue
@@ -44,13 +44,13 @@
         </template>
         <template slot="opSlot" slot-scope="{record}">  <!-- 操作列插槽 -->
           <JeepayTableColumns>
+            <a-button type="link" v-if="$access('ENT_MCH_APP_EDIT')" @click="editFunc(record.appId)">修改</a-button>
+            <a-button type="link" v-if="$access('ENT_MCH_PAY_CONFIG_LIST')" @click="showPayIfConfigList(record.appId)">支付配置</a-button>
             <a-button type="link" v-if="$access('ENT_MCH_PAY_TEST')">
               <router-link :to="{name:'ENT_MCH_PAY_TEST', params:{appId:record.appId}}">
                 支付测试
               </router-link>
             </a-button>
-            <a-button type="link" v-if="$access('ENT_MCH_APP_EDIT')" @click="editFunc(record.appId)">修改</a-button>
-            <a-button type="link" v-if="$access('ENT_MCH_PAY_CONFIG_LIST')" @click="showPayIfConfigList(record.appId)">支付配置</a-button>
             <a-button type="link" v-if="$access('ENT_MCH_APP_DEL')" style="color: red" @click="delFunc(record.appId)">删除</a-button>
           </JeepayTableColumns>
         </template>
-- 
GitLab