Merge remote-tracking branch 'origin/master'

client_h5/.env.dev

@@ -1,9 +1,6 @@
 VITE_BASE_URL='http://10.10.10.7:18080/'
 # VITE_BASE_URL='http://localhost:6090/'
 
-# 接口地址
-VITE_API_URL=/admin-api
-
 
 # File上传路径
 VITE_FILE_BASE_URI='/admin-api/infra/file'

client_h5/src/App.vue

@@ -49,7 +49,7 @@ const getUserIdByDD = async (data: Required<UserIdParam>) => {
 }
 //@ts-ignore
 const getUserInfoById = async () => {
-    return reqest.get('/admin-api/system/auth/get-permission-info')
+    return reqest.get('/system/auth/get-permission-info')
 }
 </script>
 

client_h5/src/service/user.ts

@@ -4,7 +4,7 @@ import request from "@/utils/request";
 export const getSimpleUserMap = (): Promise<any> => {
   const userMap = {}
   return new Promise<any>(async (resolve, reject) => {
-    const result = await request.get({ url: '/system/user/list-all-simple' })
+    const result = await request.get('/admin-api/system/user/list-all-simple')
     const userLists = result.data;
     userLists.forEach((item) => {
       userMap[item.id] = item.nickname

client_h5/src/utils/dict.ts

@@ -11,13 +11,13 @@ export const useDictStoreWithOut = () => {
     return result.data;
   }
   const dictObj = getStoreObject(DICT_NAME);
-  if (!dictObj) {
+  // if (!dictObj) {
     listSimpleDictData().then((resultData) => { 
       if (resultData && resultData?.length > 0) {
         setStoreObject(DICT_NAME, resultData);
       }
     });
-  }
+  // }
 }
 
 /**
@@ -33,7 +33,7 @@ export interface DictDataType {
   cssClass: string
 }
 
-export const getDictOptions = (dictType: string, option: {
+export const getDictOptions = (dictType: string, option?: {
   dictType?: string
   label?: string
   value?: string
@@ -44,10 +44,10 @@ export const getDictOptions = (dictType: string, option: {
   dictStore.forEach((dict: DictDataType) => {
     if (dict.dictType === dictType) {
       nDicts.push({
-        [option.dictType ?? 'dictType']: dict.dictType,
-        [option.label ?? 'label']: dict.label,
-        [option.value ?? 'value']: dict.value,
-        [option.cssClass ?? 'cssClass']: dict.cssClass,
+        [option?.dictType ?? 'dictType']: dict.dictType,
+        [option?.label ?? 'label']: dict.label,
+        [option?.value ?? 'value']: dict.value,
+        [option?.cssClass ?? 'cssClass']: dict.cssClass,
       })
     }
   })

client_h5/src/utils/request.ts

@@ -12,7 +12,7 @@ instance.interceptors.request.use(
       ('isAuth' in config.headers) ? null : config.headers.isAuth = true
         if (config.headers.isAuth) {
             config.headers.Authorization = `Bearer ${import.meta.env.VITE_AUTHORIZATION}`;
-        }
+      }
         const data = config.data || false
         if (
           config.method?.toUpperCase() === 'POST' &&
@@ -38,4 +38,4 @@ instance.interceptors.response.use(
         return Promise.reject(error);
     }
 );
-export default instance;
+export default instance;