فهرست منبع

修复二维码配置不生效问题

louhangfei 2 سال پیش
والد
کامیت
b6c3ad8db8
4فایلهای تغییر یافته به همراه11 افزوده شده و 16 حذف شده
  1. 2 0
      src/hooks/setting/index.ts
  2. 4 1
      src/layout/components/Header/QRcodePopover.vue
  3. 2 15
      src/utils/env.ts
  4. 3 0
      types/config.d.ts

+ 2 - 0
src/hooks/setting/index.ts

@@ -12,6 +12,7 @@ export const useGlobSetting = (): Readonly<GlobConfig> => {
     VITE_GLOB_UPLOAD_URL,
     VITE_GLOB_PROD_MOCK,
     VITE_GLOB_IMG_URL,
+    VITE_GLOB_APP_DOWNLOAD_QRCODE,
   } = getAppEnvConfig();
 
   if (!/[a-zA-Z\_]*/.test(VITE_GLOB_APP_SHORT_NAME)) {
@@ -29,6 +30,7 @@ export const useGlobSetting = (): Readonly<GlobConfig> => {
     uploadUrl: VITE_GLOB_UPLOAD_URL,
     prodMock: VITE_GLOB_PROD_MOCK,
     imgUrl: VITE_GLOB_IMG_URL,
+    appDownloadUrl: VITE_GLOB_APP_DOWNLOAD_QRCODE,
   };
   return glob as Readonly<GlobConfig>;
 };

+ 4 - 1
src/layout/components/Header/QRcodePopover.vue

@@ -38,7 +38,10 @@
 <script lang="ts" setup>
   // import { Download } from '@element-plus/icons-vue';
   import { QrCode } from '@/components/Qrcode/index';
-  const qrCodeUrl = import.meta.env.VITE_GLOB_APP_DOWNLOAD_QRCODE;
+  import { useGlobSetting } from '@/hooks/setting';
+  import { ref } from 'vue';
+  const globSetting = useGlobSetting();
+  const qrCodeUrl = ref(globSetting.appDownloadUrl);
 </script>
 
 <style scoped lang="scss">

+ 2 - 15
src/utils/env.ts

@@ -22,15 +22,7 @@ export function getAppEnvConfig() {
       (import.meta.env as unknown as GlobEnvConfig)
     : window[ENV_NAME as any]) as unknown as GlobEnvConfig;
 
-  const {
-    VITE_GLOB_APP_TITLE,
-    VITE_GLOB_API_URL,
-    VITE_GLOB_APP_SHORT_NAME,
-    VITE_GLOB_API_URL_PREFIX,
-    VITE_GLOB_UPLOAD_URL,
-    VITE_GLOB_PROD_MOCK,
-    VITE_GLOB_IMG_URL,
-  } = ENV;
+  const { VITE_GLOB_APP_SHORT_NAME, ...rest } = ENV;
 
   if (!/^[a-zA-Z\_]*$/.test(VITE_GLOB_APP_SHORT_NAME)) {
     warn(
@@ -39,13 +31,8 @@ export function getAppEnvConfig() {
   }
 
   return {
-    VITE_GLOB_APP_TITLE,
-    VITE_GLOB_API_URL,
     VITE_GLOB_APP_SHORT_NAME,
-    VITE_GLOB_API_URL_PREFIX,
-    VITE_GLOB_UPLOAD_URL,
-    VITE_GLOB_PROD_MOCK,
-    VITE_GLOB_IMG_URL,
+    ...rest,
   };
 }
 

+ 3 - 0
types/config.d.ts

@@ -54,6 +54,7 @@ export interface GlobConfig {
   uploadUrl?: string;
   prodMock: boolean;
   imgUrl?: string;
+  appDownloadUrl?: string;
 }
 
 export interface GlobEnvConfig {
@@ -71,6 +72,8 @@ export interface GlobEnvConfig {
   VITE_GLOB_IMG_URL?: string;
   //生产环境开启mock
   VITE_GLOB_PROD_MOCK: boolean;
+  /** 下载app的url */
+  VITE_GLOB_APP_DOWNLOAD_QRCODE: string;
 }
 export interface GlobConfig {
   // 标题