From 4ae2b50539a11c1dea1c19a45ddd22a621d65002 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Sat, 23 Mar 2024 16:46:32 +0800
Subject: [PATCH] =?UTF-8?q?3.23=E6=9B=B4=E6=96=B0=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=AF=B7=E6=B1=82=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/navbar/navbar.js                  |  6 ++---
 patient/pages/expertConsult/expertConsult.js |  2 +-
 utils/request.js                             | 23 ++++++++++++++------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/components/navbar/navbar.js b/components/navbar/navbar.js
index 14aa0fe..df35b70 100644
--- a/components/navbar/navbar.js
+++ b/components/navbar/navbar.js
@@ -25,9 +25,9 @@ Component({
       this.triggerEvent('handleFocus',true)
     },
     goInquirtForm(){
-      wx.navigateTo({
-        url: '/pages/sickDetail/sickDetail',
-      })
+    //   wx.navigateTo({
+    //     url: '/patient/pages/expertDetail/expertDetail?doctor_id=516904855116750848',
+    //   })
     }
   },
   
diff --git a/patient/pages/expertConsult/expertConsult.js b/patient/pages/expertConsult/expertConsult.js
index 425d105..9863435 100644
--- a/patient/pages/expertConsult/expertConsult.js
+++ b/patient/pages/expertConsult/expertConsult.js
@@ -23,7 +23,7 @@ Page({
     is_online:0,
     sort_order:1,
     inquiry_type:'1,3',
-    inquiry_mode:'1,2,6',
+    inquiry_mode:'1,2',
     navName:"专家问诊",
     scrollHeight:300,
     sickList:[],
diff --git a/utils/request.js b/utils/request.js
index 2b25918..c8e75de 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -7,15 +7,20 @@ let isLock=false;
 let host=hostConfig().host;
 //loding 是否加loading弹窗
 function request(url, method, data, loding = false) {
-  if(isLock) return;
+    let whitelist = ["/login/wechat_mobile_login", '/login/mobile_login','/code/phone','/patient/index',"/popup","/sign/im"];//接口白名单;
+    if(whitelist.indexOf(url) != -1){
+        isLock=false;
+    }
+   if(isLock) {
+       return Promise.reject("请求被lock,正常报错");
+   };
   if (loding) {
-    // wx.showLoading({
-    //   title: '加载中',
-    //   mask: true
-    // })
+    wx.showLoading({
+      title: '加载中',
+      mask: true
+    })
   }
   let token = wx.getStorageSync('AUTH_TOKEN');
-  console.log(token);
   if (!token) {
     let freelist = ["/login/wechat_mobile_login", '/login/mobile_login','/code/phone','/patient/index',"/popup","/sign/im"];//接口白名单
     let currentUrl=getCurrentPageUrl();
@@ -45,6 +50,7 @@ function request(url, method, data, loding = false) {
       data: data,
       header: header,
       success: function (res) {
+        
         var Authorization_token = res.header.Authorization;
         if (Authorization_token) {
           wx.setStorageSync('AUTH_TOKEN', Authorization_token); //当token快过期时，服务器会返回新token，本地刷新
@@ -84,12 +90,14 @@ function request(url, method, data, loding = false) {
         }else if (Number(res.data.code) == 401 || Number(res.data.code) == 403 || Number(res.data.code) == 405 || Number(res.data.code) == 406) {
             let redirectUrl=formatUrl();
             if(!isLock){
+             wx.setStorageSync('AUTH_TOKEN','');
               isLock=true;
               wx.reLaunch({
                 url: '/patient/pages/login/login?redirectUrl='+redirectUrl
               });
             }
-       
+            reject(res.data);
+           
         } else {
           wx.showToast({
             title: res.data.message,
@@ -98,6 +106,7 @@ function request(url, method, data, loding = false) {
           })
         }
         isLock=false;
+        reject(res.data);
       },
       fail: function (res) {
           console.log(res)