Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

components.d.ts

@@ -29,7 +29,6 @@ declare module 'vue' {
     CtTextField: typeof import('./src/components/CtVuetify/CtTextField/index.vue')['default']
     DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
     File: typeof import('./src/components/Upload/file.vue')['default']

src/config/axios/service.js

@@ -129,6 +129,7 @@ service.interceptors.request.use(
         body,
         appId: 'web_client',
         AppSecret: 'fa0fc0b5098b974b',
+        // timestamp: 1735282548997,
         timestamp: process?.env?.NODE_ENV === 'production' ? systemInfo.beijingTimestamp : new Date().getTime(),
       })
       const content = {
@@ -200,11 +201,11 @@ service.interceptors.response.use(
     const code = data.code || result_code
     // 获取错误信息
     const msg = data.msg || errorCode[code] || errorCode['default']
-    const _index = errorData.findIndex(e => e.url === config.url && e.time === +config.headers.timestamp)
-    if (ignoreMsgs.indexOf(msg) !== -1) {
+    if (ignoreMsgs.indexOf(msg) > -1) {
       // 如果是忽略的错误码，直接返回 msg 异常
       return Promise.reject(msg)
-    } else if (code === 401) {
+    }
+    if (code === 401) {
       // 如果未认证，并且未进行刷新令牌，说明可能是访问令牌过期了
       // token类型
       const tokenIndex = config.tokenIndex ? config.tokenIndex : getIsEnterprise() ? 1 : 2
@@ -253,31 +254,35 @@ service.interceptors.response.use(
           })
         })
       }
-    } else if (code === 500) {
+    }
+    if (code === 500) {
       Snackbar.error(t('sys.api.errMsg500'))
       return Promise.reject(new Error(msg))
-    } else if (code === 900 && msg === '重复请求，请稍后重试') {
+    }
+    if (code === 900 && msg === '重复请求，请稍后重试') {
       console.error('前台打印: 重复请求，请稍后重试')
       return Promise.reject(new Error(msg))
-    } else if (code === 901) {
+    }
+    if (code === 901) {
       Snackbar.error(t('sys.api.errMsg901'))
       return Promise.reject(new Error(msg))
-    } else if (code !== 200) {
-      if ([1100017019, 1100016002, 1100021016, 1100017022].includes(code)) {
-        // 1100017019邮箱未注册、1100016002手机号未注册过、1100021016注册企业申请中
-        // 未注册过的手机号将code码返回
-        return Promise.reject(data)
-      } else {
-        if (_index > -1) {
-          // 保存错误信息
-          sendError({ content: JSON.stringify(errorData[_index].content), mark: errorData[_index].time + '' })
-          // 移除
-          errorData.splice(_index, 1)
-        }
-        Snackbar.error(msg)
+    }
+    if ([1100017019, 1100016002, 1100021016, 1100017022].includes(code)) {
+      // 1100017019邮箱未注册、1100016002手机号未注册过、1100021016注册企业申请中
+      // 未注册过的手机号将code码返回
+      return Promise.reject(data)
+    }
+    if (code !== 200) {
+      const _index = errorData.findIndex(e => e.url === config.url && e.time === +config.headers.timestamp)
+      if (_index > -1) {
+        const _item = errorData.splice(_index, 1)
+        // 保存错误信息
+        sendError({ content: JSON.stringify(_item.content), mark: _item.time + '' })
       }
+      Snackbar.error(msg)
       return Promise.reject(msg)
     }
+    const _index = errorData.findIndex(e => e.url === config.url && e.time === +config.headers.timestamp)
     if (_index > -1) {
       errorData.splice(_index, 1)
     }