fix 登录过期处理

config/config.js

@@ -476,25 +476,25 @@ const appInfoObj = {
 };
 
 // @config 确定使用的小程序appid
-const current_appid = "wx706acdc696d025ad";
+const current_appid = "wxa7a33088566e1292";
 export const apple = {
     ...appInfoObj[current_appid],
     appKey: "49TBR8Z1rA7PyqD30FV0v48AU",
     bookList: [
-        {"bookId":10622,"wxBookId":"A1HfxT8JKd2JZVaNWv2wdUSzzt","chapterId":"A1Hcfv5eeHmEiXSLaUZDjcEU9e"},
-        {"bookId":7174,"wxBookId":"A1HfQDmNTSJjUB72ZiBx5363Wx","chapterId":"A1HfQDnxjTEh86aUBcFTLuxEUG"},
-        {"bookId":9103,"wxBookId":"A1cueQWFr6kGvoEA2p1WXnn31S"},
-{"bookId":9548,"wxBookId":"A1aXCxrnU64jSoTwofX4cGY1X6"},
-{"bookId":9549,"wxBookId":"A1aXCbKJz2R6j6DPC2mqAPdP3E"},
-{"bookId":9731,"wxBookId":"A1Y6apumQqSqZcEt2SnLra9UQ8"},
-{"bookId":9801,"wxBookId":"A1Y3reSnEdvAHkUmU1hFeFY5nY"},
-{"bookId":9986,"wxBookId":"A1TGRnK36ZfT3KmMoaAWY3cCNt"},
-{"bookId":10078,"wxBookId":"A1Qt15VnJZE7T2FbfGH8SzEjng"},
-{"bookId":10622,"wxBookId":"A1aXCxrnU64jSoTwofX4cGY1X6"},
-{"bookId":9867,"wxBookId":"A1VesxhvPvFaffxQauVc9pTSun"},
-{"bookId":10664,"wxBookId":"A1L3J3wnFgexyHNTKFWVEzCiM6"},
-{"bookId":10745,"wxBookId":"A1L2D5CPFHZW6Gzr9VdypmijDJ"},
-{"bookId":10746,"wxBookId":"A1L2CaaQKERs4BNTxDYhF1L8PA"}
+        { "bookId": 10622, "wxBookId": "A1HfxT8JKd2JZVaNWv2wdUSzzt", "chapterId": "A1Hcfv5eeHmEiXSLaUZDjcEU9e" },
+        { "bookId": 7174, "wxBookId": "A1HfQDmNTSJjUB72ZiBx5363Wx", "chapterId": "A1HfQDnxjTEh86aUBcFTLuxEUG" },
+        { "bookId": 9103, "wxBookId": "A1cueQWFr6kGvoEA2p1WXnn31S" },
+        { "bookId": 9548, "wxBookId": "A1aXCxrnU64jSoTwofX4cGY1X6" },
+        { "bookId": 9549, "wxBookId": "A1aXCbKJz2R6j6DPC2mqAPdP3E" },
+        { "bookId": 9731, "wxBookId": "A1Y6apumQqSqZcEt2SnLra9UQ8" },
+        { "bookId": 9801, "wxBookId": "A1Y3reSnEdvAHkUmU1hFeFY5nY" },
+        { "bookId": 9986, "wxBookId": "A1TGRnK36ZfT3KmMoaAWY3cCNt" },
+        { "bookId": 10078, "wxBookId": "A1Qt15VnJZE7T2FbfGH8SzEjng" },
+        { "bookId": 10622, "wxBookId": "A1aXCxrnU64jSoTwofX4cGY1X6" },
+        { "bookId": 9867, "wxBookId": "A1VesxhvPvFaffxQauVc9pTSun" },
+        { "bookId": 10664, "wxBookId": "A1L3J3wnFgexyHNTKFWVEzCiM6" },
+        { "bookId": 10745, "wxBookId": "A1L2D5CPFHZW6Gzr9VdypmijDJ" },
+        { "bookId": 10746, "wxBookId": "A1L2CaaQKERs4BNTxDYhF1L8PA" }
     ]
 };
 

utils/request.js

@@ -141,8 +141,7 @@ export const requestAll = (requestUrl, body, method = 'POST', customHeaders = {}
   // 封装请求函数
   const doRequest = () => {
     return new Promise((resolve, reject) => {
-      // 优先使用传入的token，其次使用storage中的token
-      const token = customHeaders.token || wx.getStorageSync('accessToken') || '';
+      const token = wx.getStorageSync('accessToken') || '';
 
       wx.request({
         url: url,
@@ -150,7 +149,6 @@ export const requestAll = (requestUrl, body, method = 'POST', customHeaders = {}
         method: method,
         dataType: 'json',
         header: {
-          ...customHeaders,
           token
         },
         success: function (res) {
@@ -160,9 +158,9 @@ export const requestAll = (requestUrl, body, method = 'POST', customHeaders = {}
             } else {
               resolve(res.data.data || []);
             }
-          } 
-          else if(res.data.code==20001){
-            reject({code: 20001, msg: '令牌过期'});
+          }
+          else if (res.data.code == 20001) {
+            reject({ code: 20001, msg: '令牌过期' });
           }
           else {
             reject(res.data);
@@ -199,13 +197,14 @@ export const requestAll = (requestUrl, body, method = 'POST', customHeaders = {}
           loginPromise = getApp().login();
         }
         await loginPromise;
-        
+
         // 重置登录状态和Promise
         isLoggingIn = false;
         loginPromise = null;
 
         // 执行所有请求
         if (pendingRequests.length > 0) {
+          console.log(wx.getStorageSync('accessToken'))
           pendingRequests.push(() => doRequest());
           return executePendingRequests();
         }
@@ -237,11 +236,11 @@ export function postWithCommonParams(url, body, method = 'POST') {
     body.uuid = 'fuck'
   }
   body.gh_id = apple.ghid
-  
+
   // 判断是否为完整URL
   const isFullUrl = url.startsWith('http://') || url.startsWith('https://')
   const fullUrl = isFullUrl ? url : https.apiHttps + url
-  
+
   if (method === 'POST') {
     return post(fullUrl, body)
   } else {