bug: fix #5335

config/dev.js

@@ -9,8 +9,8 @@ module.exports = {
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://192.168.0.218:8080"',
-    WSS_HOST: '"ws://192.168.0.218:8080"',
+    HOST: '"http://192.168.0.84:8080"',
+    WSS_HOST: '"ws://192.168.0.84:8080"',
   },
   weapp: {},
   h5: {}

src/utils/request.js

@@ -28,7 +28,7 @@ export const setStorage = function (key, data) {
  */
 export const fetch = async (options) => {
   const { url, payload, method = 'GET', showToast = true, autoLogin = true } = options
-  console.log(Taro.getStorageSync('token'),'----token---')
+  // console.log(Taro.getStorageSync('token'),'----token---')
   return Taro.request({
     url,
     method,
@@ -45,36 +45,49 @@ export const fetch = async (options) => {
         title: "请检查网络",
         icon: 'none'
       })
-      return Promise.reject({ message: "请检查网络" })
-    }
-    const { data, code } = res.data
-    if (code !== CODE_SUCCESS) {
-      return Promise.reject(res.data)
+
+      console.error(res)
+      throw new Error('请检查网络')
     }
 
-    // if (url.split('?')[0] === API_USER_LOGIN) {
-    //   await updateToken(data.miniApp)
-    // }
-    return data
-  }).catch((err) => {
-    const isExpired = (err.code === CODE_AUTH_EXPIRED || err.code === CODE_UNLOGIN)
-    const defaultMsg = isExpired ? '登录失效' : (err.message || '请求异常')
-    if (isExpired && autoLogin) {
-      // token失效，重新登录后，跳转到首页
-      login({}, () => {
-        Taro.switchTab({
-          url: '/pages/project/index'
-        })
-      })
+    const { data, code, message } = res.data
+    if (code === CODE_SUCCESS) {
+      return data
     } else {
-      if (showToast) {
-        Taro.showToast({
-          title: err && err.msg || defaultMsg,
-          icon: 'none'
+      const isExpired = (code === CODE_AUTH_EXPIRED || code === CODE_UNLOGIN)
+      const defaultMsg = isExpired ? '登录失效' : message
+      if (isExpired && autoLogin) {
+        // token失效，重新登录后，跳转到首页
+        login({}, () => {
+          Taro.switchTab({
+            url: '/pages/project/index'
+          })
         })
+      } else {
+        if (showToast) {
+          Taro.showToast({
+            title: defaultMsg,
+            icon: 'none'
+          })
+        }
       }
+      console.error(res.data)
+      throw new Error(data)
     }
-    return Promise.reject({ message: defaultMsg, ...err })
+  }).catch((err) => {
+    console.error(err)
+
+    let errMessage = `请求失败: ${err.errMsg}`
+    if (err.errMsg === 'request:fail timeout') {
+      errMessage = '请检查网络'
+    }
+
+    Taro.showToast({
+      title: errMessage,
+      icon: 'none'
+    })
+
+    throw new Error(errMessage)
   })
 }