From 921da15eeb7bcde15f1375d47606de01d702f0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E5=9F=8E?=
 <141405260+17521612761@users.noreply.github.com>
Date: Thu, 7 Aug 2025 10:39:09 +0800
Subject: [PATCH] =?UTF-8?q?uniapp=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=8D=93=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=9C=AA=E7=99=BB=E9=99=86=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E6=97=A0=E6=B3=95=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/core/store/login.ts              | 67 ++++++++++---------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/core/store/login.ts b/CoreCms.Net.Uni-App/CoreShop/core/store/login.ts
index eae2f630..17e4ec88 100644
--- a/CoreCms.Net.Uni-App/CoreShop/core/store/login.ts
+++ b/CoreCms.Net.Uni-App/CoreShop/core/store/login.ts
@@ -1,38 +1,45 @@
 import { defineStore } from 'pinia';
 import { UserToken } from '@/core/consts';
-import { handleShowToast } from '@/core/utils';
+import { handleShowToast, handleRouteNavigateTo } from '@/core/utils';
 import { queryUserInfo } from '@/core/api';
 import type { UserLoginStoreType, Response, UserInfoType } from '@/core/models';
 import { useUserInfoStore } from './userInfo';
 
 export const useLoginStore = defineStore('useLoginStore', {
-	state: () : UserLoginStoreType => {
-		return {
-			showLoginModalTogglePop: false
-		};
-	},
-	actions: {
-		/** 检查是否登录 */
-		checkLogin(callBack : () => void) {
-			if (!uni.getStorageSync(UserToken)) {
-				this.setShowLoginModalTogglePop(true);
-			} else {
-				callBack();
-			}
-		},
-		/** 获取用户数据 */
-		async getUserInfo() {
-			const userInfoStore = useUserInfoStore();
-			const userInfo : Response<UserInfoType> = await queryUserInfo();
-			if (userInfo.status) {
-				userInfoStore.setUserInfo(userInfo?.data);
-			} else {
-				handleShowToast(userInfo.msg)
-			}
-		},
-		/** 设置登录弹框打开或者关闭 */
-		setShowLoginModalTogglePop(showLoginModalTogglePop : boolean) {
-			this.showLoginModalTogglePop = showLoginModalTogglePop;
-		},
-	},
+    state: () : UserLoginStoreType => {
+        return {
+            showLoginModalTogglePop: false
+        };
+    },
+    actions: {
+        /** 检查是否登录 */
+        checkLogin(callBack : () => void) {
+            if (!uni.getStorageSync(UserToken)) {
+                // #ifdef MP-ALIPAY || MP-WEIXIN
+                this.setShowLoginModalTogglePop(true);
+                // #endif
+
+                // #ifndef MP-WEIXIN || MP-ALIPAY 
+                handleRouteNavigateTo(`/pages/login/login?backUrl=${'/pages/member/member'}`)
+                // #endif
+
+            } else {
+                callBack();
+            }
+        },
+        /** 获取用户数据 */
+        async getUserInfo() {
+            const userInfoStore = useUserInfoStore();
+            const userInfo : Response<UserInfoType> = await queryUserInfo();
+            if (userInfo.status) {
+                userInfoStore.setUserInfo(userInfo?.data);
+            } else {
+                handleShowToast(userInfo.msg)
+            }
+        },
+        /** 设置登录弹框打开或者关闭 */
+        setShowLoginModalTogglePop(showLoginModalTogglePop : boolean) {
+            this.showLoginModalTogglePop = showLoginModalTogglePop;
+        },
+    },
 });
\ No newline at end of file