修改请求方式代码

src/api/business/fireIot/facilitiesGather/index.js

@@ -1,5 +1,4 @@
-import upload from "@/utils/upload";
-import request from "@/utils/request";
+import { request, uploads } from "@/utils/request";
 
 // 设施类型查询接口
 export function typeSelect(param) {
@@ -21,7 +20,7 @@ export function add(param) {
 
 // 图片上传
 export function uploadAvatar(data) {
-    return upload({
+    return uploads({
         url: "/service-file/upload",
         name: data.name,
         filePath: data.filePath,

src/api/business/fireIot/facilitiesView/index.js

@@ -1,5 +1,4 @@
-import upload from "@/utils/upload";
-import request from "@/utils/request";
+import { request } from "@/utils/request";
 
 // 设施查询列表请求
 export function baseFacilityType(param) {

src/api/business/mhxf/deviceManage/index.js

@@ -1,5 +1,4 @@
-import upload from "@/utils/upload";
-import request from "@/utils/request";
+import { request } from "@/utils/request";
 
 /**
  * @分类信息查询

src/api/business/mhxf/fireReport/index.js

@@ -1,5 +1,4 @@
-import upload from "@/utils/upload";
-import request from "@/utils/request";
+import { request } from "@/utils/request";
 
 /**
  * @历史报告列表查询接口

src/api/business/mhxf/informationSelect/index.js

@@ -1,5 +1,4 @@
-import upload from "@/utils/upload";
-import request from "@/utils/request";
+import { request } from "@/utils/request";
 
 /**
  * @分类信息查询

src/api/business/mhxf/needMatter/index.js

@@ -1,5 +1,4 @@
-import upload from "@/utils/upload";
-import request from "@/utils/request";
+import { request, uploads } from "@/utils/request";
 
 /**
  * @待办事项列表查询接口
@@ -26,7 +25,7 @@ export function updateMobileReformStatus(param) {
  * @图片上传
  */
 export function uploadAvatar(data) {
-  return upload({
+  return uploads({
     url: "/service-file/upload",
     name: data.name,
     filePath: data.filePath,
@@ -36,7 +35,7 @@ export function uploadAvatar(data) {
 /**
  * @待办事项上传整改资料
  */
- export function addReformMaterial(param) {
+export function addReformMaterial(param) {
   return request({
     url: "/service-fire/demFireReform/addReformMaterial",
     method: "POST",

src/api/business/mhxf/unitInfoCollection/index.js

@@ -1,5 +1,4 @@
-import upload from "@/utils/upload";
-import request from "@/utils/request";
+import { request } from "@/utils/request";
 
 /**
  * @单位信息采集

src/api/business/mhxf/xunJian/collect.js

@@ -1,5 +1,4 @@
-import upload from "@/utils/upload";
-import request from "@/utils/request";
+import { request } from "@/utils/request";
 
 /**
  * @提交

src/api/business/mhxf/xunJian/index.js

@@ -1,4 +1,4 @@
-import request from "@/utils/request";
+import { request } from "@/utils/request";
 
 // ehcarts接口请求
 export function appPlanStatistics(param) {

src/api/business/mhxf/xunJian/plan.js

@@ -1,5 +1,4 @@
-import upload from "@/utils/upload";
-import request from "@/utils/request";
+import { request, uploads } from "@/utils/request";
 
 //
 export function recordList(param) {
@@ -48,7 +47,7 @@ export function appPlanStatistics(param) {
 
 // 图片上传
 export function uploadAvatar(data) {
-  return upload({
+  return uploads({
     url: "/service-file/upload",
     name: data.name,
     filePath: data.filePath,

src/api/business/mhxf/xunJian/record.js

@@ -1,5 +1,4 @@
-import upload from "@/utils/upload";
-import request from "@/utils/request";
+import { request } from "@/utils/request";
 
 /**
  * @巡检记录列表数据请求

src/api/index/index.js

@@ -1,4 +1,4 @@
-import request from "@/utils/request";
+import { request } from "@/utils/request";
 
 // 动态菜单请求
 export function getAppRouters(param) {

src/api/login.js

@@ -1,4 +1,4 @@
-import request from "@/utils/request";
+import { request } from "@/utils/request";
 
 // 登录方法
 export function login(data) {

src/api/mine/info.js

@@ -1,5 +1,4 @@
-import upload from "@/utils/upload";
-import request from "@/utils/request";
+import { request } from "@/utils/request";
 
 /**
  * @列表数据请求

src/api/setting/building.js

@@ -1,5 +1,4 @@
-import upload from "@/utils/upload";
-import request from "@/utils/request";
+import { request } from "@/utils/request";
 
 /**
  * @建筑基础数据请求

src/api/setting/funReport.js

@@ -1,5 +1,4 @@
-import upload from "@/utils/upload";
-import request from "@/utils/request";
+import { request } from "@/utils/request";
 
 /**
  * @删除请求接口

src/api/setting/index.js

@@ -1,5 +1,4 @@
-import upload from "@/utils/upload";
-import request from "@/utils/request";
+import { request } from "@/utils/request";
 
 /**
  * @

src/api/system/user.js

@@ -1,5 +1,4 @@
-import upload from '@/utils/upload'
-import request from '@/utils/request'
+import { request, uploads } from '@/utils/request';
 
 // 用户密码重置
 export function updateUserPwd(oldPassword, newPassword) {
@@ -33,7 +32,7 @@ export function updateUserProfile(data) {
 
 // 用户头像上传
 export function uploadAvatar(data) {
-  return upload({
+  return uploads({
     url: "/service-file/upload",
     name: data.name,
     filePath: data.filePath,

src/utils/request.js

@@ -74,6 +74,7 @@ const request = (config) => {
       })
       .catch((error) => {
         let { message } = error;
+        if (!message) return;
         if (message === "Network Error") {
           message = "后端接口连接异常";
         } else if (message.includes("timeout")) {
@@ -86,4 +87,71 @@ const request = (config) => {
   });
 };
 
-export default request;
+const uploads = (config) => {
+  const useStore = useStores();
+  // 是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false;
+  config.header = config.header || {};
+  if (getToken() && !isToken) {
+    config.header["Authorization"] = getToken();
+  }
+  // get请求映射params参数
+  if (config.params) {
+    let url = config.url + "?" + common.tansParams(config.params);
+    url = url.slice(0, -1);
+    config.url = url;
+  }
+
+  return new Promise((resolve, reject) => {
+    uni.uploadFile({
+      timeout: config.timeout || timeout,
+      url: configs.baseUrl + config.url,
+      filePath: config.filePath,
+      name: config.name || "file",
+      header: config.header,
+      formData: config.formData,
+      success: (res) => {
+        let result = JSON.parse(res.data);
+        const code = result.code || 200;
+        if (code === 200) {
+          resolve(result);
+        } else if (code == 401) {
+          modal.confirm("登录状态已过期，您可以继续留在该页面，或者重新登录?").then((res) => {
+            if (res) {
+              useStore.LogOut().then((res) => {
+                uni.reLaunch({ url: "/pages/login" });
+              });
+            }
+          });
+          reject("无效的会话，或者会话已过期，请重新登录。");
+        } else if (code === 500 || res.statusCode === 500) {
+          if (res.data.msg.indexOf(":") !== -1) {
+            modal.msg(res.data.msg.split(":")[1]);
+            reject(res.data.msg.split(":")[1]);
+          } else {
+            modal.msg(res.data.msg);
+            reject(res.data.msg);
+          }
+        } else if (code !== 200 && code !== "0") {
+          reject(code);
+        }
+      },
+      fail: (error) => {
+        let { message } = error;
+        if (message == "Network Error") {
+          message = "后端接口连接异常";
+        } else if (message.includes("timeout")) {
+          message = "系统接口请求超时";
+        } else if (message.includes("Request failed with status code")) {
+          message = "系统接口" + message.substr(message.length - 3) + "异常";
+        }
+        reject(error);
+      },
+    });
+  });
+};
+
+export {
+  request,
+  uploads
+};

src/utils/upload.js

@@ -1,73 +0,0 @@
-import { useStores } from "@/store/modules/index";
-import configs from "@/config";
-import { getToken } from "@/utils/auth";
-import modal from "@/plugins/modal.plugins";
-import common from "@/plugins/common.plugins";
-
-let timeout = 10000;
-
-const upload = (config) => {
-  const useStore = useStores();
-  // 是否需要设置 token
-  const isToken = (config.headers || {}).isToken === false;
-  config.header = config.header || {};
-  if (getToken() && !isToken) {
-    config.header["Authorization"] = getToken();
-  }
-  // get请求映射params参数
-  if (config.params) {
-    let url = config.url + "?" + common.tansParams(config.params);
-    url = url.slice(0, -1);
-    config.url = url;
-  }
-
-  return new Promise((resolve, reject) => {
-    uni.uploadFile({
-      timeout: config.timeout || timeout,
-      url: configs.baseUrl + config.url,
-      filePath: config.filePath,
-      name: config.name || "file",
-      header: config.header,
-      formData: config.formData,
-      success: (res) => {
-        let result = JSON.parse(res.data);
-        const code = result.code || 200;
-        if (code === 200) {
-          resolve(result);
-        } else if (code == 401) {
-          modal.confirm("登录状态已过期，您可以继续留在该页面，或者重新登录?").then((res) => {
-            if (res) {
-              useStore.LogOut().then((res) => {
-                uni.reLaunch({ url: "/pages/login" });
-              });
-            }
-          });
-          reject("无效的会话，或者会话已过期，请重新登录。");
-        } else if (code === 500 || res.statusCode === 500) {
-          if (res.data.msg.indexOf(":") !== -1) {
-            modal.msg(res.data.msg.split(":")[1]);
-            reject(res.data.msg.split(":")[1]);
-          } else {
-            modal.msg(res.data.msg);
-            reject(res.data.msg);
-          }
-        } else if (code !== 200 && code !== "0") {
-          reject(code);
-        }
-      },
-      fail: (error) => {
-        let { message } = error;
-        if (message == "Network Error") {
-          message = "后端接口连接异常";
-        } else if (message.includes("timeout")) {
-          message = "系统接口请求超时";
-        } else if (message.includes("Request failed with status code")) {
-          message = "系统接口" + message.substr(message.length - 3) + "异常";
-        }
-        reject(error);
-      },
-    });
-  });
-};
-
-export default upload;