同步6/16

src/utils/request.ts

@@ -41,10 +41,10 @@ const whiteVillageId = [
   '/waterDevice/generateBarCode', // 水表 条码
   '/electricityDevice/generateBarCode', // 电表 条码
   '/payRecordList/payRecordList/list',
-
-  '/warehouse/*'
-  // '/storeroom/getList/*'
-  // 以后直接在这里加新地址，支持 /xxx/*、/xxx/xxx 写法
+  '/warehouse',
+  '/notification/read', // 已读
+  '/cash/billList',
+  '/building/list'
 ];
 
 /**
@@ -75,7 +75,10 @@ export function needVillageId(url: string): boolean {
 service.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
     // 对应国际化资源文件后缀
+    const villageid = localStorage.getItem('villageid');
     config.headers['Content-Language'] = getLanguage();
+    config.headers['villageId'] = villageid;
+    const disableAutoVillage = config.headers?.autoVillage === false;
 
     const isToken = config.headers?.isToken === false;
     // 是否需要防止数据重复提交
@@ -87,7 +90,6 @@ service.interceptors.request.use(
       config.headers['Authorization'] = 'Bearer ' + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
     }
     // get请求映射params参数
-    const villageid = localStorage.getItem('villageid');
     if (config.method === 'get' && config.params) {
       let url = '';
       if (villageid != 'null' && needVillageId(config.url)) {
@@ -95,8 +97,8 @@ service.interceptors.request.use(
           config.url +
           '?' +
           tansParams({
-            ...config.params,
-            villageId: villageid
+            villageId: villageid,
+            ...config.params
           });
       } else {
         url = config.url + '?' + tansParams(config.params);
@@ -110,8 +112,8 @@ service.interceptors.request.use(
       let obj = null;
       if (villageid != 'null' && needVillageId(config.url)) {
         obj = {
-          ...config.data,
-          villageId: villageid
+          villageId: villageid,
+          ...config.data
         };
       } else {
         obj = config.data;
@@ -166,6 +168,7 @@ service.interceptors.request.use(
 // 响应拦截器
 service.interceptors.response.use(
   (res: AxiosResponse) => {
+    const silentError = res.config.headers?.silentError === 'true';
     if (import.meta.env.VITE_APP_ENCRYPT === 'true') {
       // 加密后的 AES 秘钥
       const keyStr = res.headers[encryptHeader];
@@ -213,7 +216,9 @@ service.interceptors.response.use(
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。');
     } else if (code === HttpStatus.SERVER_ERROR) {
       // 500
-      ElMessage({ message: msg, type: 'error' });
+      if (!silentError) {
+        ElMessage({ message: msg, type: 'error' });
+      }
       return Promise.reject(res.data);
     } else if (code === HttpStatus.WARN) {
       // 601
@@ -249,7 +254,7 @@ export function download(url: string, params: any, fileName: string) {
           return tansParams(params);
         }
       ],
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      headers: { 'Content-Type': 'application/x-www-form-urlencoded',silentError: 'true' },
       responseType: 'blob'
     }).then(async (resp: any) => {
       const isLogin = blobValidate(resp);