From f1f48388c04cfe85f3675e2ba4a9081f724dd60a Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Thu, 13 Jun 2024 17:56:26 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E6=89=AB=E7=A0=81=E7=99=BB=E9=99=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system-setting/src/main/resources/permission.json  |  2 +-
 frontend/src/views/login/components/tabQrCode.vue      |  4 ++--
 frontend/src/views/login/components/weComQrCode.vue    |  1 -
 .../setting/system/config/components/qrCodeConfig.vue  | 10 +++++-----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/backend/services/system-setting/src/main/resources/permission.json b/backend/services/system-setting/src/main/resources/permission.json
index 47f05b0130..55adea288c 100644
--- a/backend/services/system-setting/src/main/resources/permission.json
+++ b/backend/services/system-setting/src/main/resources/permission.json
@@ -169,7 +169,7 @@
             "license": true
           },
           {
-            "id": "SYSTEM_PARAMETER_SETTING_QRCODE:READ",
+            "id": "SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE",
             "name": "permission.system_parameter_setting_qrcode.update",
             "license": true
           }
diff --git a/frontend/src/views/login/components/tabQrCode.vue b/frontend/src/views/login/components/tabQrCode.vue
index 903eb385a2..503b3f0e95 100644
--- a/frontend/src/views/login/components/tabQrCode.vue
+++ b/frontend/src/views/login/components/tabQrCode.vue
@@ -99,7 +99,7 @@
 
 <style lang="less" scoped>
   .tabPlatform {
-    width: 400px;
+    min-width: 480px;
     height: 40px;
   }
   .login-qrcode {
@@ -135,7 +135,7 @@
     }
   }
   .radioOneButton {
-    width: 200px;
+    width: 100%;
     display: flex;
     flex-direction: row;
     flex-wrap: nowrap;
diff --git a/frontend/src/views/login/components/weComQrCode.vue b/frontend/src/views/login/components/weComQrCode.vue
index 183c8ee215..5e723bd64a 100644
--- a/frontend/src/views/login/components/weComQrCode.vue
+++ b/frontend/src/views/login/components/weComQrCode.vue
@@ -43,7 +43,6 @@
         state: 'fit2cloud-wecom-qr',
         redirect_type: WWLoginRedirectType.callback,
         panel_size: WWLoginPanelSizeType.small,
-        scope: 'snsapi_privateinfo',
       },
       onCheckWeComLogin: obj.value,
       async onLoginSuccess({ code }: any) {
diff --git a/frontend/src/views/setting/system/config/components/qrCodeConfig.vue b/frontend/src/views/setting/system/config/components/qrCodeConfig.vue
index b20ba9472e..dd05d0bca6 100644
--- a/frontend/src/views/setting/system/config/components/qrCodeConfig.vue
+++ b/frontend/src/views/setting/system/config/components/qrCodeConfig.vue
@@ -43,7 +43,7 @@
                         type="outline"
                         class="arco-btn-outline--secondary"
                         size="mini"
-                        :disabled="!item.valid || !hasAnyPermission(['SYSTEM_SERVICE_INTEGRATION:READ+UPDATE'])"
+                        :disabled="!item.valid || !hasAnyPermission(['SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE'])"
                         @click="getValidateHandler(item.key)"
                         >{{ t('organization.service.testLink') }}</a-button
                       ></span
@@ -51,7 +51,7 @@
                   </a-tooltip>
                   <a-button
                     v-else
-                    :disabled="!item.valid || !hasAnyPermission(['SYSTEM_SERVICE_INTEGRATION:READ+UPDATE'])"
+                    :disabled="!item.valid || !hasAnyPermission(['SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE'])"
                     type="outline"
                     class="arco-btn-outline--secondary"
                     size="mini"
@@ -60,7 +60,7 @@
                   </a-button>
                   <a-button
                     v-if="item.edit"
-                    v-permission="['SYSTEM_SERVICE_INTEGRATION:READ+UPDATE']"
+                    v-permission="['SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE']"
                     type="outline"
                     class="arco-btn-outline--secondary"
                     size="mini"
@@ -69,7 +69,7 @@
                   </a-button>
                   <a-button
                     v-else
-                    v-permission="['SYSTEM_SERVICE_INTEGRATION:READ+ADD']"
+                    v-permission="['SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE']"
                     type="outline"
                     class="arco-btn-outline--secondary"
                     size="mini"
@@ -91,7 +91,7 @@
                     v-else
                     v-model="item.enable"
                     size="small"
-                    :disabled="!hasAnyPermission(['SYSTEM_SERVICE_INTEGRATION:READ+UPDATE'])"
+                    :disabled="!hasAnyPermission(['SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE'])"
                     @change="(v) => changeStatus(v, item.key)"
                   />
                 </span>