From 7dc29ed74ebaa8a0e66f68264d9a13f95dc3af21 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 02 八月 2024 11:09:06 +0800
Subject: [PATCH] aa

---
 wechat_staff/utils/request.js |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/wechat_staff/utils/request.js b/wechat_staff/utils/request.js
index 87ecfb4..6056b6b 100644
--- a/wechat_staff/utils/request.js
+++ b/wechat_staff/utils/request.js
@@ -3,10 +3,10 @@
 export function request(options) {
   let loading = options.loading || '1' // 榛樿鍊�1鏄剧ず锛屽惁鍒欎笉鏄剧ず
   if (loading == '1') {
-    wx.showLoading()
+    wx.showLoading({mask: true})
     number++
   }
-  return new Promise(resolve => {
+  return new Promise(resolve=> {
     wx.request({
       url: baseUrl + options.url,
       data: options.data || {},
@@ -21,10 +21,14 @@
           resolve(res.data || true)
         } else {
           if (res.data.code && (res.data.code == 5112 || res.data.code == 5111)) {
-            wx.navigateTo({
-              url: '/pages/login/index',
-            })
-          }
+            if(options.data && options.data.goLogin){
+              console.log("==================")
+              wx.navigateTo({
+                        url: '/pages/login/index',
+              })
+            } 
+          } 
+          resolve(res) 
           res.data.message && wx.showToast({
             title: res.data.message || '鍙戠敓閿欒',
             icon: 'none'

--
Gitblit v1.9.3