From b5023a66b41e5903f09cf898aeaae5426c1c6293 Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Sat, 19 Oct 2024 18:56:25 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91(=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF)=EF=BC=9A?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=AF=B7=E6=B1=82=E6=88=90=E5=8A=9F=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue     |  4 +++-
 .../CoreShop/pages/subpackage/custom/custom.vue      | 12 +++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue b/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
index f7ae3a87..456d1d71 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
@@ -82,7 +82,9 @@
 	/** 获取用户信息 */
 	const getUserInfo = async () => {
 		const userInfo : Response<UserInfoType> = await queryUserInfo();
-		userInfoStore.setUserInfo(userInfo?.data);
+		if(userInfo.status){
+			userInfoStore.setUserInfo(userInfo?.data);
+		}
 	}
 
 	/** 搜索 */
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/custom/custom.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/custom/custom.vue
index 9e44117e..8bfc6c25 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/custom/custom.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/custom/custom.vue
@@ -32,10 +32,10 @@
 </template>
 
 <script setup lang="ts">
-	import { onPageScroll, onload } from '@dcloudio/uni-app';
+	import { onPageScroll, onLoad } from '@dcloudio/uni-app';
 	import { reactive } from 'vue';
 	import { queryPageConfig, queryUserInfo } from '@/core/api';
-	import type { Response, PageConfigType, PageConfigItemsType, UserInfoType, UserInfoStoreType } from '@/core/models';
+	import type { Response, PageConfigType, PageConfigItemsType, UserInfoType } from '@/core/models';
 	import CustomPage from '@/pages/components/custom-page/index.vue';
 	import HomeAdpop from '@/pages/components/custom-page/components/home-adpop/home-adpop.vue';
 	import { handleStaticResources } from '@/core/utils';
@@ -50,7 +50,7 @@
 	/** 获取自定义导航栏高度 */
 	const { statusBarHeight } = useSystemInfo();
 	/** 获取 用户数据 */
-	const userInfoStore : UserInfoStoreType = useUserInfoStore();
+	const userInfoStore = useUserInfoStore();
 
 	const state = reactive<{
 		coreshopData : Array<PageConfigItemsType>;
@@ -68,7 +68,7 @@
 		}
 	})
 
-	onload((query : QueryParams) => {
+	onLoad((query : QueryParams) => {
 		getPageConfig(query?.code);
 		if (uni.getStorageSync(UserToken)) {
 			getUserInfo();
@@ -83,7 +83,9 @@
 	/** 获取用户信息 */
 	const getUserInfo = async () => {
 		const userInfo : Response<UserInfoType> = await queryUserInfo();
-		userInfoStore.setUserInfo(userInfo?.data);
+		if(userInfo.status){
+			userInfoStore.setUserInfo(userInfo?.data);
+		}
 	}
 </script>