From 864a0573921523db3b5b1deaca05e4c442c1df01 Mon Sep 17 00:00:00 2001
From: blue2999 <14265734+blue2999@user.noreply.gitee.com>
Date: Mon, 6 May 2024 01:36:12 +0000
Subject: [PATCH] =?UTF-8?q?update=20pages/index/login.vue.=20=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E5=85=88=E7=94=A8=E6=89=8B=E6=9C=BA=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=86=8D=E5=88=B0=E4=BB=98=E6=AC=BE=E9=A1=B5=E9=9D=A2=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E5=BE=AE=E4=BF=A1=E6=8E=88=E6=9D=83=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=BB=91=E5=AE=9AopenId=E8=BF=98=E6=B2=A1?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=AE=8C=E5=B0=B1=E8=B7=B3=E8=BD=AC=E5=9B=9E?=
 =?UTF-8?q?=E5=8E=BB=EF=BC=8C=E5=8F=88=E9=99=B7=E5=85=A5=E6=B2=A1=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=9A=84=E5=BE=AA=E7=8E=AF=EF=BC=8C=E8=BF=99=E9=87=8C?=
 =?UTF-8?q?=E5=81=9A=E4=B8=80=E4=B8=AA=E5=BB=B6=E8=BF=9F=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: blue2999 <14265734+blue2999@user.noreply.gitee.com>
---
 pages/index/login.vue | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pages/index/login.vue b/pages/index/login.vue
index b2c82a4a..d2ebc797 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -17,22 +17,28 @@
     const event = options.event;
     const code = options.code;
     const state = options.state;
+    let time = 10;
     if (event === 'login') { // 场景一：登录
       const res = await sheep.$platform.useProvider().login(code, state);
     } else if (event === 'bind') { // 场景二：绑定
       sheep.$platform.useProvider().bind(code, state);
+	  time = 1000;
     }
 
-    // 检测 H5 登录回调
-    let returnUrl = uni.getStorageSync('returnUrl');
-    if (returnUrl) {
-      uni.removeStorage({key:'returnUrl'});
-      location.replace(returnUrl);
-    } else {
-      uni.switchTab({
-        url: '/',
-      });
-    }
+    // 避免先用手机登录再到付款页面重新微信授权登录时，绑定openId还没执行完就跳转回去，又陷入没登录的循环，所以这里做一个延迟跳转
+	setTimeout(function(){
+		// 检测 H5 登录回调
+		let returnUrl = uni.getStorageSync('returnUrl');
+		if (returnUrl) {
+		  uni.removeStorage({key:'returnUrl'});
+		  location.replace(returnUrl);
+		} else {
+		  uni.switchTab({
+		    url: '/',
+		  });
+		}
+	},time);
+
     // #endif
   });
 </script>