From c79660747a44c64e2333f778798a1bad2ffdf710 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Wed, 30 Oct 2024 10:47:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1048335 --user=王孝刚 【系统设置】扫描登录页面弹出错误信息：Missing parameters https://www.tapd.cn/57709429/s/1601519
---
 .../lang/zh_CN/views/application-overview.ts  |  2 +-
 .../component/XPackDisplaySettingDialog.vue   |  6 +++---
 .../views/login/components/dingtalkQrCode.vue | 19 +++++++++++--------
 ui/src/views/theme/index.vue                  | 16 ++++++++--------
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/ui/src/locales/lang/zh_CN/views/application-overview.ts b/ui/src/locales/lang/zh_CN/views/application-overview.ts
index 058b93986..4a080a939 100644
--- a/ui/src/locales/lang/zh_CN/views/application-overview.ts
+++ b/ui/src/locales/lang/zh_CN/views/application-overview.ts
@@ -11,7 +11,7 @@ export default {
     embedThirdParty: '嵌入第三方',
     accessRestrictions: '访问限制',
     displaySetting: '显示设置',
-    apiAccessCredentials: 'API访问凭据',
+    apiAccessCredentials: 'API 访问凭据',
     apiKey: 'API Key',
     refreshToken: {
       msgConfirm1: '是否重新生成公开访问链接?',
diff --git a/ui/src/views/application-overview/component/XPackDisplaySettingDialog.vue b/ui/src/views/application-overview/component/XPackDisplaySettingDialog.vue
index 1af74181d..6ea29e008 100644
--- a/ui/src/views/application-overview/component/XPackDisplaySettingDialog.vue
+++ b/ui/src/views/application-overview/component/XPackDisplaySettingDialog.vue
@@ -171,7 +171,7 @@
                 action="#"
                 :auto-upload="false"
                 :show-file-list="false"
-                accept="image/*"
+                accept="image/jpeg, image/png, image/gif"
                 :on-change="(file: any, fileList: any) => onChange(file, fileList, 'user_avatar')"
               >
                 <el-button size="small"> 替换 </el-button>
@@ -190,7 +190,7 @@
                 action="#"
                 :auto-upload="false"
                 :show-file-list="false"
-                accept="image/*"
+                accept="image/jpeg, image/png, image/gif"
                 :on-change="(file: any, fileList: any) => onChange(file, fileList, 'avatar')"
               >
                 <el-button size="small"> 替换 </el-button>
@@ -208,7 +208,7 @@
                 action="#"
                 :auto-upload="false"
                 :show-file-list="false"
-                accept="image/*"
+                accept="image/jpeg, image/png, image/gif"
                 :on-change="(file: any, fileList: any) => onChange(file, fileList, 'float_icon')"
               >
                 <el-button size="small"> 替换 </el-button>
diff --git a/ui/src/views/login/components/dingtalkQrCode.vue b/ui/src/views/login/components/dingtalkQrCode.vue
index 259d57d5c..63387507c 100644
--- a/ui/src/views/login/components/dingtalkQrCode.vue
+++ b/ui/src/views/login/components/dingtalkQrCode.vue
@@ -11,7 +11,7 @@
 <script lang="ts" setup>
 import { useRouter } from 'vue-router'
 import { useScriptTag } from '@vueuse/core'
-import { defineProps, onMounted, ref } from 'vue'
+import { defineProps, ref, watch } from 'vue'
 import useStore from '@/stores'
 import { MsgError } from '@/utils/message'
 
@@ -121,13 +121,16 @@ const initActive = async () => {
   }
 }
 
-onMounted(() => {
-  // Simulate config loading completion
-  setTimeout(() => {
-    isConfigReady.value = true
-    initActive()
-  }, 1000)
-})
+watch(
+  () => props.config,
+  (newConfig) => {
+    if (newConfig.app_secret && newConfig.app_key && newConfig.crop_id) {
+      isConfigReady.value = true
+      initActive()
+    }
+  },
+  { immediate: true }
+)
 </script>
 
 <style lang="scss">
diff --git a/ui/src/views/theme/index.vue b/ui/src/views/theme/index.vue
index 61ce313d4..6bb017570 100644
--- a/ui/src/views/theme/index.vue
+++ b/ui/src/views/theme/index.vue
@@ -43,7 +43,7 @@
                             action="#"
                             :auto-upload="false"
                             :show-file-list="false"
-                            accept="image/*"
+                            accept="image/jpeg, image/png, image/gif"
                             :on-change="
                               (file: any, fileList: any) => onChange(file, fileList, 'icon')
                             "
@@ -52,8 +52,8 @@
                           </el-upload>
                         </div>
                         <el-text type="info" size="small"
-                          >顶部网站显示的 Logo，建议尺寸 48*48，支持 JPG、PNG、SVG，大小不超过
-                          200KB</el-text
+                          >顶部网站显示的 Logo，建议尺寸 48*48，支持 JPG、PNG、GIF，大小不超过 10
+                          MB</el-text
                         >
                       </el-card>
                       <el-card shadow="never" class="mb-8">
@@ -64,7 +64,7 @@
                             action="#"
                             :auto-upload="false"
                             :show-file-list="false"
-                            accept="image/*"
+                            accept="image/jpeg, image/png, image/gif"
                             :on-change="
                               (file: any, fileList: any) => onChange(file, fileList, 'loginLogo')
                             "
@@ -73,8 +73,8 @@
                           </el-upload>
                         </div>
                         <el-text type="info" size="small"
-                          >登录页面右侧 Logo，建议尺寸 204*52，支持 JPG、PNG、SVG，大小不超过
-                          200KB</el-text
+                          >登录页面右侧 Logo，建议尺寸 204*52，支持 JPG、PNG、GIF，大小不超过 10
+                          MB</el-text
                         >
                       </el-card>
                       <el-card shadow="never" class="mb-8">
@@ -85,7 +85,7 @@
                             action="#"
                             :auto-upload="false"
                             :show-file-list="false"
-                            accept="image/*"
+                            accept="image/jpeg, image/png, image/gif"
                             :on-change="
                               (file: any, fileList: any) => onChange(file, fileList, 'loginImage')
                             "
@@ -95,7 +95,7 @@
                         </div>
                         <el-text type="info" size="small">
                           左侧背景图，矢量图建议尺寸 576*900，位图建议尺寸 1152*1800；支持
-                          JPG、PNG、SVG，大小不超过 5M
+                          JPG、PNG、GIF，大小不超过 10 MB
                         </el-text>
                       </el-card>