From 9776537e59ef304e11a4565bb5b22f812660acad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B9=85=E4=BF=9D=E5=90=8C=E5=AD=A6?= <3228274159@qq.com>
Date: Sun, 25 Aug 2024 20:29:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E8=A7=86=E4=B8=BA=E7=99=BB=E5=BD=95=E4=B8=8D?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=B0=86=E4=BC=9A=E6=8F=90=E7=A4=BA=E5=B9=B6?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=B7=B3=E8=BD=AC=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dist/dev/mp-weixin/utils/interceptor.js   | 20 ++++++++++++++-----
 utils/interceptor.js                          | 19 +++++++++++++-----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/unpackage/dist/dev/mp-weixin/utils/interceptor.js b/unpackage/dist/dev/mp-weixin/utils/interceptor.js
index 7d745e4..ad91cae 100644
--- a/unpackage/dist/dev/mp-weixin/utils/interceptor.js
+++ b/unpackage/dist/dev/mp-weixin/utils/interceptor.js
@@ -8,15 +8,25 @@ list.forEach((item) => {
     invoke(e) {
       const phonePattern = /^1[3456789]\d{9}$/;
       let token;
-      if (phonePattern.test(common_vendor.index.getStorageSync("phoneNumber"))) {
-        token = common_vendor.index.getStorageSync("phoneNumber");
-      } else {
+      if (!phonePattern.test(common_vendor.index.getStorageSync("phoneNumber"))) {
         common_vendor.index.showToast({
           icon: "none",
-          title: "登录失败,请重新登录",
-          duration: 1e3
+          title: "登录不存在,请重新登录",
+          duration: 1e3,
+          success: () => {
+            setTimeout(() => {
+              common_vendor.index.showToast({
+                icon: "none",
+                title: "登录不存在,请重新登录",
+                duration: 800
+              });
+            }, 1e3);
+          }
         });
       }
+      if (phonePattern.test(common_vendor.index.getStorageSync("phoneNumber"))) {
+        token = common_vendor.index.getStorageSync("phoneNumber");
+      }
       const url = e.url.split("?")[0];
       if (!needLogin.includes(url) && !token) {
         common_vendor.index.navigateTo({
diff --git a/utils/interceptor.js b/utils/interceptor.js
index 9a26fab..fd3db8c 100644
--- a/utils/interceptor.js
+++ b/utils/interceptor.js
@@ -11,15 +11,24 @@ let needLogin = ['/pages/index/index','/pages/handle/handle','/pages/login/login
 						// 暂时将token验证替换手机号
 						const phonePattern = /^1[3456789]\d{9}$/;
 						let token 
-						if(phonePattern.test(uni.getStorageSync('phoneNumber'))){
-							token=uni.getStorageSync('phoneNumber')
-						}else{
+						if(!phonePattern.test(uni.getStorageSync('phoneNumber'))){
 							uni.showToast({
 								icon:"none",
-								title:"登录失败,请重新登录",
-								duration:1000
+								title:"登录不存在,请重新登录",
+								duration:1000,
+								success: () => {
+									setTimeout(()=>{
+										uni.showToast({
+											icon:"none",
+											title:"登录不存在,请重新登录",
+											duration:800,})
+									},1000)
+								}
 							})
 						}
+						if(phonePattern.test(uni.getStorageSync('phoneNumber'))){
+							token=uni.getStorageSync('phoneNumber')
+						}
 						
                         //获取当前页面路径（即url去掉"?"和"?"后的参数）
                         // console.log(token,'router index token')