From 089578941e8a1368454dff7b4540a172fd58508a Mon Sep 17 00:00:00 2001
From: damonyuan <404054358@qq.com>
Date: Thu, 14 Nov 2024 13:54:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E6=97=B6=E8=80=8C?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=99=BB=E5=BD=95=E5=90=8E=EF=BC=8C=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=A4=B1=E8=B4=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 uniapp/src/pages/login/login.vue | 34 +++++++++++++++++---------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/uniapp/src/pages/login/login.vue b/uniapp/src/pages/login/login.vue
index 026916b0..8e3eea39 100644
--- a/uniapp/src/pages/login/login.vue
+++ b/uniapp/src/pages/login/login.vue
@@ -164,23 +164,21 @@
                 </view>
                 <view class="flex justify-between mt-[40rpx]">
                     <view
-						v-if="
-						    formData.scene == LoginWayEnum.MOBILE &&
-						    includeLoginWay(LoginWayEnum.ACCOUNT)
-						"
+                        v-if="
+                            formData.scene == LoginWayEnum.MOBILE &&
+                            includeLoginWay(LoginWayEnum.ACCOUNT)
+                        "
                         >已有账号，使用
-                        <span
-                            class="text-primary"
-                            @click="changeLoginWay(LoginWayEnum.ACCOUNT)"
+                        <span class="text-primary" @click="changeLoginWay(LoginWayEnum.ACCOUNT)"
                             >密码登录</span
                         >
-					</view>
-					<view
-						v-if="
-						    formData.scene == LoginWayEnum.ACCOUNT &&
-						    includeLoginWay(LoginWayEnum.MOBILE)
-						"
-					    >已有账号，使用
+                    </view>
+                    <view
+                        v-if="
+                            formData.scene == LoginWayEnum.ACCOUNT &&
+                            includeLoginWay(LoginWayEnum.MOBILE)
+                        "
+                        >已有账号，使用
                         <span
                             class="text-primary"
                             @click="changeLoginWay(LoginWayEnum.MOBILE)"
@@ -359,8 +357,12 @@ const loginHandle = async (data: any) => {
         } catch (error) {
             router.switchTab(cache.get(BACK_URL))
         }
-    } else {
-        router.reLaunch('/pages/index/index')
+    } else {
+        try {
+            router.reLaunch('/pages/index/index')
+        } catch (error) {
+            router.switchTab('/pages/index/index')
+        }
     }
     cache.remove(BACK_URL)
 }