From 916e7dec096c8e93f931fa0b8919999dc089b65d Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 2 Sep 2024 18:45:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=99=BB=E5=BD=95=E6=A0=B7=E5=BC=8F=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/login/dingTalkQrCode.vue         |  4 ++--
 .../frontend/src/business/login/index.vue         |  2 +-
 .../frontend/src/business/login/larkQrCode.vue    |  5 ++---
 .../src/business/login/larkSuiteQrCode.vue        |  5 ++---
 .../frontend/src/business/login/tabQrCode.vue     | 15 ++++++++-------
 .../frontend/src/business/login/weComQrCode.vue   |  5 +++--
 .../src/business/system/setting/QrCodeConfig.vue  | 10 +++++-----
 7 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/business/login/dingTalkQrCode.vue b/framework/sdk-parent/frontend/src/business/login/dingTalkQrCode.vue
index 79be6b3be9..f4491626e3 100644
--- a/framework/sdk-parent/frontend/src/business/login/dingTalkQrCode.vue
+++ b/framework/sdk-parent/frontend/src/business/login/dingTalkQrCode.vue
@@ -48,10 +48,10 @@ export default {
         userStore.getIsLogin()
             .then(res => {
               this.getLanguage(res.data.language);
-              window.location.href = "/";
               sessionStorage.setItem('loginSuccess', 'true');
               sessionStorage.setItem('changePassword', callback.message);
               localStorage.setItem('AuthenticateType', 'QRCODE');
+              this.checkRedirectUrl()
             })
             .catch(data => {
               // 保存公钥
@@ -60,7 +60,7 @@ export default {
               if (lang) {
                 setLanguage(lang);
               }
-              this.checkRedirectUrl()
+              window.location.href = "/";
             });
       },
       getLanguage(language) {
diff --git a/framework/sdk-parent/frontend/src/business/login/index.vue b/framework/sdk-parent/frontend/src/business/login/index.vue
index 7cead710f1..de1d744943 100644
--- a/framework/sdk-parent/frontend/src/business/login/index.vue
+++ b/framework/sdk-parent/frontend/src/business/login/index.vue
@@ -49,7 +49,7 @@
               {{ $t('commons.login') }}
             </el-button>
           </div>
-          <el-divider class="login-divider"><span style="color: #959598; font-size: 12px">更多登录方式</span></el-divider>
+          <el-divider  v-if="orgOptions.length > 0"  class="login-divider"><span style="color: #959598; font-size: 12px">更多登录方式</span></el-divider>
           <div
               v-if="orgOptions.length > 0"
               class="loginType"
diff --git a/framework/sdk-parent/frontend/src/business/login/larkQrCode.vue b/framework/sdk-parent/frontend/src/business/login/larkQrCode.vue
index 3d8c924131..75155c0f08 100644
--- a/framework/sdk-parent/frontend/src/business/login/larkQrCode.vue
+++ b/framework/sdk-parent/frontend/src/business/login/larkQrCode.vue
@@ -26,7 +26,7 @@ export default{
           goto: url,
           width: '300',
           height: '300',
-          style: 'width:300px;height:300px', // 可选的，二维码html标签的style属性
+          style: 'width:300px;height:300px;border-width: 0px;', // 可选的，二维码html标签的style属性
         });
 
         // function handleMessage
@@ -59,7 +59,6 @@ export default{
 
 <style scoped>
   .lark-qrName {
-    width: 300px;
-    height: 300px;
+
   }
 </style>
diff --git a/framework/sdk-parent/frontend/src/business/login/larkSuiteQrCode.vue b/framework/sdk-parent/frontend/src/business/login/larkSuiteQrCode.vue
index 14c9c42420..c37a01a513 100644
--- a/framework/sdk-parent/frontend/src/business/login/larkSuiteQrCode.vue
+++ b/framework/sdk-parent/frontend/src/business/login/larkSuiteQrCode.vue
@@ -24,7 +24,7 @@ export default{
           goto: url,
           width: '300',
           height: '300',
-          style: 'width:300px;height:300px', // 可选的，二维码html标签的style属性
+          style: 'width:300px;height:300px;border-width: 0px;', // 可选的，二维码html标签的style属性
         });
 
         // function handleMessage
@@ -55,7 +55,6 @@ export default{
 
 <style scoped>
   .lark-suite-qrName {
-    width: 300px;
-    height: 300px;
+
   }
 </style>
diff --git a/framework/sdk-parent/frontend/src/business/login/tabQrCode.vue b/framework/sdk-parent/frontend/src/business/login/tabQrCode.vue
index 43a6ba5585..8741c0d151 100644
--- a/framework/sdk-parent/frontend/src/business/login/tabQrCode.vue
+++ b/framework/sdk-parent/frontend/src/business/login/tabQrCode.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="qrcode">
+  <div class="tab_qrcode">
     <el-tabs v-model="activeName" type="border-card" class="tabPlatform" @tab-click="handleClick">
       <el-tab-pane
           v-for="item of orgOptions"
@@ -111,12 +111,18 @@ export default {
 </script>
 
 <style scoped>
-.qrcode{
+.tab_qrcode{
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
   justify-content: space-around;
 }
+:deep(.el-tabs__nav){
+  width: 100%;
+}
+:deep(.el-tabs__item ){
+  width: 25%;
+}
 
 .ms-icon{
   height: 24px;
@@ -138,7 +144,6 @@ export default {
     justify-content: center;
     align-items: center;
     overflow: hidden;
-    border-radius: 8px;
     background: #ffffff;
     flex-direction: column;
   }
@@ -153,10 +158,6 @@ export default {
     line-height: 26px;
     margin-bottom: -24px;
     z-index: 100000;
-    .ed-icon {
-      margin-right: 8px;
-      font-size: 24px;
-    }
   }
 }
 .radioOneButton{
diff --git a/framework/sdk-parent/frontend/src/business/login/weComQrCode.vue b/framework/sdk-parent/frontend/src/business/login/weComQrCode.vue
index 064303e1cf..982db8385e 100644
--- a/framework/sdk-parent/frontend/src/business/login/weComQrCode.vue
+++ b/framework/sdk-parent/frontend/src/business/login/weComQrCode.vue
@@ -54,7 +54,6 @@
         userStore.getIsLogin()
             .then(res => {
               this.getLanguage(res.data.language);
-              window.location.href = "/";
               sessionStorage.setItem('loginSuccess', 'true');
               sessionStorage.setItem('changePassword', weComCallback.message);
               localStorage.setItem('AuthenticateType', 'QRCODE');
@@ -66,8 +65,8 @@
               if (lang) {
                 setLanguage(lang);
               }
-              this.checkRedirectUrl()
             });
+        this.checkRedirectUrl()
       },
       getLanguage(language) {
         if (!language) {
@@ -97,6 +96,8 @@
             onLoginSuccess(code) {
               getWeComCallback(code).then(res=>{
                 const weComCallback = res.data;
+                console.log("weComCallback")
+                console.log(weComCallback)
                 this.doLogin(weComCallback)
                 localStorage.setItem('loginType', 'WE_COM');
               });
diff --git a/system-setting/frontend/src/business/system/setting/QrCodeConfig.vue b/system-setting/frontend/src/business/system/setting/QrCodeConfig.vue
index 591e60d592..b54363a7cd 100644
--- a/system-setting/frontend/src/business/system/setting/QrCodeConfig.vue
+++ b/system-setting/frontend/src/business/system/setting/QrCodeConfig.vue
@@ -32,28 +32,28 @@
                           class="arco-btn-outline--secondary"
                           size="mini"
                           :disabled="
-                          !item.hasConfig || !hasAnyPermission(['SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE'])
+                          !item.hasConfig || !checkPermission('SYSTEM_SETTING:READ+EDIT')
                         "
                           @click="getValidateHandler(item.key)"
                       >{{ $t('qrcode.service_testLink') }}</el-button></span>
           </el-tooltip>
           <el-button
               v-else
-              :disabled="!item.hasConfig || !checkPermission('SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE')"
+              :disabled="!item.hasConfig || !checkPermission('SYSTEM_SETTING:READ+EDIT')"
               size="mini"
               @click="getValidateHandler(item.key)"
           >{{ $t('qrcode.service_testLink') }}
           </el-button>
           <el-button
               v-if="item.edit"
-              v-permission="['SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE']"
+              v-permission="['SYSTEM_SETTING:READ+EDIT']"
               size="mini"
               @click="editHandler(item.key)"
           >{{ $t('qrcode.service_edit') }}
           </el-button>
           <el-button
               v-else
-              v-permission="['SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE']"
+              v-permission="['SYSTEM_SETTING:READ+EDIT']"
               size="mini"
               @click="editHandler(item.key)"
           >{{ $t('commons.add') }}
@@ -73,7 +73,7 @@
                 v-else
                 v-model="item.enable"
                 size="small"
-                :disabled="!checkPermission('SYSTEM_PARAMETER_SETTING_QRCODE:READ+UPDATE')"
+                :disabled="!checkPermission('SYSTEM_SETTING:READ+EDIT')"
                 @change="(v) => changeStatus(v, item.key)"
             />
           </span>