From fb45c3fc10048d12f0dc683ef00d095c088708e0 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Mon, 4 Dec 2023 19:06:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=E7=BC=BA=E5=A4=B1?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AF=BC=E8=87=B4=E7=9A=84=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/register.vue                        | 26 +++++++++++++++----
 .../setting/components/change-login-bg.vue    |  7 ++---
 src/views/tool/help/index.vue                 |  3 ++-
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/views/register.vue b/src/views/register.vue
index ac0c8e52..fab8306e 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -1,14 +1,15 @@
 <script lang="ts" setup>
 import { GlobalFooter } from 'antdv-pro-layout';
 import { Modal, message } from 'ant-design-vue/lib';
-import { onMounted, reactive, toRaw } from 'vue';
+import { computed, onMounted, reactive, toRaw } from 'vue';
 import { register } from '@/api/login';
 import { regExpPasswd, regExpUserName } from '@/utils/regular-utils';
 import { useRouter, useRoute } from 'vue-router';
 import useAppStore from '@/store/modules/app';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
-const { t } = useI18n();
+import { parseUrlPath } from '@/plugins/file-static-url';
+const { t, currentLocale } = useI18n();
 const router = useRouter();
 const route = useRoute();
 const appStore = useAppStore();
@@ -70,6 +71,22 @@ function fnFinish() {
     });
 }
 
+// LOGO地址
+const logoUrl = computed(() => {
+  let url =
+    appStore.logoType === 'brand'
+      ? parseUrlPath(appStore.filePathBrand)
+      : parseUrlPath(appStore.filePathIcon);
+
+  if (url.indexOf('{language}') === -1) {
+    return url;
+  }
+  // 语言参数替换
+  const local = currentLocale.value;
+  const lang = local.split('_')[0];
+  return url.replace('{language}', lang);
+});
+
 /**
  * 国际化翻译转换
  */
@@ -92,11 +109,11 @@ onMounted(() => {
       <div class="header">
         <a href="/" target="_self">
           <template v-if="appStore.logoType === 'icon'">
-            <img :src="appStore.getLOGOIcon" class="logo" alt="logo" />
+            <img :src="logoUrl" class="logo" alt="logo" />
             <span class="title">{{ appStore.appName }}</span>
           </template>
           <template v-if="appStore.logoType === 'brand'">
-            <img :src="appStore.getLOGOBrand" class="logo" alt="logo" />
+            <img :src="logoUrl" class="logo" alt="logo" />
           </template>
         </a>
       </div>
@@ -205,7 +222,6 @@ onMounted(() => {
   width: 100%;
   min-height: 100%;
   padding: 110px 0 144px;
-  background-image: url(../assets/background.svg);
   background-repeat: no-repeat;
   background-position: center 110px;
   background-size: 100%;
diff --git a/src/views/system/setting/components/change-login-bg.vue b/src/views/system/setting/components/change-login-bg.vue
index f883482a..c66b8c69 100644
--- a/src/views/system/setting/components/change-login-bg.vue
+++ b/src/views/system/setting/components/change-login-bg.vue
@@ -9,6 +9,7 @@ import { uploadFile } from '@/api/tool/file';
 import { FileType } from 'ant-design-vue/lib/upload/interface';
 import { UploadRequestOption } from 'ant-design-vue/lib/vc-upload/interface';
 import { sessionGet } from '@/utils/cache-session-utils';
+import { parseUrlPath } from '@/plugins/file-static-url';
 const appStore = useAppStore();
 const { t } = useI18n();
 
@@ -84,7 +85,7 @@ function fnEdit(v: boolean) {
   state.edite = v;
   if (!v) {
     state.filePath = '#';
-    state.flag = appStore.getLoginBackground;
+    state.flag = parseUrlPath(appStore.loginBackground);
   }
 }
 
@@ -142,8 +143,8 @@ function fnRevert() {
 }
 
 onMounted(() => {
-  state.filePath = appStore.getLoginBackground;
-  state.flag = appStore.getLoginBackground;
+  state.filePath = parseUrlPath(appStore.loginBackground);
+  state.flag = parseUrlPath(appStore.loginBackground);
 });
 </script>
 
diff --git a/src/views/tool/help/index.vue b/src/views/tool/help/index.vue
index 7fd32d5c..40f72ebd 100644
--- a/src/views/tool/help/index.vue
+++ b/src/views/tool/help/index.vue
@@ -6,13 +6,14 @@ import { useRoute } from 'vue-router';
 import { VuePDF, usePDF } from '@tato30/vue-pdf';
 import '@tato30/vue-pdf/style.css';
 import saveAs from 'file-saver';
+import { parseUrlPath } from '@/plugins/file-static-url';
 const { t, currentLocale } = useI18n();
 const appStore = useAppStore();
 const route = useRoute();
 
 // 文档地址
 const docUrl = computed(() => {
-  let url = appStore.getHelpDoc;
+  let url = parseUrlPath(appStore.helpDoc);
   if (url.indexOf('{language}') === -1) {
     return url;
   }