From 5d4fee524aa37988e266f9b37bf82ed4498ca7b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E5=9F=8E?= <17521612761@163.com>
Date: Mon, 21 Oct 2024 19:22:47 +0800
Subject: [PATCH 01/15] =?UTF-8?q?uniapp=E3=80=90=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=EF=BC=88sku=E6=A8=A1=E5=9D=97=EF=BC=89=EF=BC=9Asku?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=A7=84=E6=A0=BC=E7=BB=99=E6=9C=80=E9=AB=98?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=EF=BC=8C=E8=B6=85=E5=87=BA=E6=BB=91=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/goods-detail-sku/goods-detail-sku.scss          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.scss b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.scss
index ca5558a9..5a7e3538 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.scss
@@ -51,6 +51,8 @@
 			display: flex;
 			flex-wrap: wrap;
 			gap: 25rpx;
+			max-height: 500rpx;
+			overflow-y: scroll;
 			.tag {
 				position: relative;
 				font-size: 27rpx;
@@ -58,6 +60,7 @@
 				border: 1rpx solid #6e737d;
 				border-radius: 15rpx; 
 				text-align: center;  
+				height: max-content;
 				.icon-select {
 					position: absolute;
 					right: 0;

From 5a83563b1ff4871ece0888ab19e9a95dafca7626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?21=E4=B8=96=E7=BA=AA=E5=B0=8F=E5=85=AB=E8=B7=AF?=
 <2529156631@qq.com>
Date: Tue, 22 Oct 2024 00:27:17 +0800
Subject: [PATCH 02/15] =?UTF-8?q?uniapp=E3=80=90=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=91=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5=E5=AF=BC?=
 =?UTF-8?q?=E8=A1=8C=E6=A0=8F=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/components/coreshop-navbar/coreshop-navbar.vue | 4 +++-
 .../coreshop-page-content/coreshop-page-content.vue         | 2 +-
 .../CoreShop/components/coreshop-page/coreshop-page.vue     | 2 +-
 CoreCms.Net.Uni-App/CoreShop/core/hooks/systemInfo.ts       | 6 +++++-
 CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue            | 2 +-
 .../pages/subpackage/activity/pinTuan/list/list.scss        | 3 +--
 .../pages/subpackage/activity/seckill/list/list.scss        | 5 +++--
 7 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
index 2543d339..7b124362 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
@@ -1,5 +1,5 @@
 <template>
-	<uv-navbar :bgColor="props.bgColor">
+	<uv-navbar :bgColor="props.bgColor" placeholder :height="menuButtonHeight+'px'">
 		<template #left>
 			<view class="page-back">
 				<image v-if="props.isBack" @click="hanlderBack" class="back"
@@ -15,7 +15,9 @@
 </template>
 
 <script setup lang="ts">
+	import { useSystemInfo } from '@/core/hooks';
 	import { handleStaticResources } from '@/core/utils';
+	const { menuButtonHeight } = useSystemInfo();
 
 	const props = withDefaults(defineProps<{
 		isBack : boolean,
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue
index 013a4e51..ba7318ed 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue
@@ -3,7 +3,7 @@
 		<coreshop-navbar :isBack="props.isBack" :bgColor="props.bgColor" :mode="props.mode" :title="props.title"
 			:titleColor="props.titleColor" :handleCustomRouteJump="props.handleCustomRouteJump"></coreshop-navbar>
 		<view class="layout-page-content"
-			:style="{ 'padding-top': `${props.isShowStatusBarHeight ? statusBarHeight : 0}px`, ...props.contentStyle }">
+			:style="{ ...props.contentStyle }">
 			<slot></slot>
 		</view>
 		<template v-if="props.showLoginModalDom">
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
index 7928c7c1..a02cd385 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
@@ -30,7 +30,7 @@
 		skeletonLoading : boolean;
 	}>(), {
 		isBack: true,
-		bgColor: '#EEF3F7',
+		bgColor: '#D33123',
 		titleColor: '#000',
 		mode: 'center',
 		title: '',
diff --git a/CoreCms.Net.Uni-App/CoreShop/core/hooks/systemInfo.ts b/CoreCms.Net.Uni-App/CoreShop/core/hooks/systemInfo.ts
index 74082e7c..a303386a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/core/hooks/systemInfo.ts
+++ b/CoreCms.Net.Uni-App/CoreShop/core/hooks/systemInfo.ts
@@ -4,16 +4,20 @@ export const useSystemInfo = () => {
 	const state = reactive<{
 		systemInfo : any;
 		statusBarHeight : number;
+		menuButtonHeight : number;
 	}>({
 		systemInfo: {},
 		statusBarHeight: 0,
+		menuButtonHeight: 44
 	});
 
 
 	onMounted(async () => {
+		const menuButton = uni.getMenuButtonBoundingClientRect();
 		const systemInfo = await uni.getSystemInfo();
 		state.systemInfo = systemInfo;
-		state.statusBarHeight = systemInfo.statusBarHeight + systemInfo.safeArea.top;
+		state.menuButtonHeight = menuButton.height + (menuButton.top - systemInfo.statusBarHeight) * 2;
+		state.statusBarHeight = systemInfo.statusBarHeight + state.menuButtonHeight;
 	})
 
 	return toRefs(state);
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue b/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
index 456d1d71..2665e721 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
@@ -10,7 +10,7 @@
 				</template>
 			</uv-navbar>
 
-			<view class="content-box p-25" :style="{ 'padding-top': `${statusBarHeight + 10}px` }">
+			<view class="content-box p-25">
 				<CustomPage ref="homePage" :coreshopData="state.coreshopData"></CustomPage>
 			</view>
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/list/list.scss b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/list/list.scss
index f0efeb32..6b75f164 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/list/list.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/list/list.scss
@@ -11,8 +11,7 @@
 	.content-box {
 		position: relative;
 		margin: 25rpx;
-		padding-top: 200rpx;
-
+		
 		.title-box {
 			display: flex;
 			align-items: center;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/list/list.scss b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/list/list.scss
index 9863b7dc..1211f589 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/list/list.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/list/list.scss
@@ -1,3 +1,6 @@
+.layout-seckill-box{
+	 padding-top: 80rpx;
+}
 .navbar-box {
 	position: fixed;
 	left: 0;
@@ -31,8 +34,6 @@
 }
 
 .seckill-box {
-	padding-top: 100rpx;
-
 	.card-box {
 		margin-bottom: 35rpx;
 		margin: 25rpx;

From c8d266199254d5f566270baf221a32cab549f0ae Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Tue, 22 Oct 2024 21:14:21 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/core/hooks/index.ts              |  1 +
 .../CoreShop/core/hooks/use-share.ts          | 61 +++++++++++++++
 .../CoreShop/pages/goods/detail.vue           | 76 ++++++++++++++-----
 3 files changed, 117 insertions(+), 21 deletions(-)
 create mode 100644 CoreCms.Net.Uni-App/CoreShop/core/hooks/use-share.ts

diff --git a/CoreCms.Net.Uni-App/CoreShop/core/hooks/index.ts b/CoreCms.Net.Uni-App/CoreShop/core/hooks/index.ts
index 015a01b7..932f35ab 100644
--- a/CoreCms.Net.Uni-App/CoreShop/core/hooks/index.ts
+++ b/CoreCms.Net.Uni-App/CoreShop/core/hooks/index.ts
@@ -1,3 +1,4 @@
 /** 系统配置 */
 export * from './systemInfo';
 export * from './use-loading';
+export * from './use-share';
diff --git a/CoreCms.Net.Uni-App/CoreShop/core/hooks/use-share.ts b/CoreCms.Net.Uni-App/CoreShop/core/hooks/use-share.ts
new file mode 100644
index 00000000..b3945b4a
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/core/hooks/use-share.ts
@@ -0,0 +1,61 @@
+import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
+import { queryShare } from '@/core/api';
+import { ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
+import { handleShowToast } from '@/core/utils';
+import { UserToken } from '@/core/consts';
+
+interface RequestParam {
+	client ?: ShareClientEnum;
+	url ?: string;
+	type ?: ShareModelEnum;
+	page ?: ShareEnum;
+	params ?: any;
+	token ?: string;
+}
+
+export const useShareHook = () => {
+
+	/** 获取分享url */
+	const getShareUrl = (requestParam : RequestParam) => {
+		return new Promise(async (resolve) => {
+			let data = requestParam;
+			if (uni.getStorageSync(UserToken)) {
+				data['token'] = uni.getStorageSync(UserToken)
+			}
+			const share = await queryShare(data);
+			if (share.status) {
+				resolve(share.data);
+			} else {
+				handleShowToast(share.msg);
+			}
+		})
+	}
+
+	const shareAppMessage = (options : Page.CustomShareContent) => {
+		onShareAppMessage(() => {
+			console.log('onShareAppMessage');
+			return {
+				...options
+			};
+		});
+		return { onShareAppMessage };
+	};
+
+	const shareTimeline = (options : Page.CustomShareContent) => {
+		onShareTimeline(() => {
+			console.log('shareTimeline');
+			return {
+				...options
+			};
+		});
+		return { onShareTimeline };
+	};
+
+	const share = (customShareContent : Page.CustomShareContent, shareTimelineContent ?: Page.CustomShareContent) => {
+		const { onShareAppMessage } = shareAppMessage(customShareContent);
+		const { onShareTimeline } = shareTimeline(shareTimelineContent ? shareTimelineContent : customShareContent);
+		return { onShareAppMessage, onShareTimeline };
+	};
+
+	return { share, getShareUrl, shareAppMessage, shareTimeline };
+};
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
index d14e26e2..70cdc3de 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
@@ -26,8 +26,8 @@
 
 <script setup lang="ts">
 	import { reactive } from 'vue';
-	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
-	import { queryGoodsDetail, queryCartNum, queryShare, queryGoodsDetailByToken, queryPromotionList, queryAddCart, queryUserInfo } from '@/core/api';
+	import { onLoad , onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
+	import { queryGoodsDetail, queryCartNum, queryShare, queryGoodsDetailByToken, queryPromotionList, queryAddCart } from '@/core/api';
 	import type { Response, GoodsAgentListType, GoodsPromotionType, GoodsSkuListType } from "@/core/models";
 	import { PromotionEnum, AddCartEnum, PaymentTypeEnum, ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
 	import { UserToken, shareUrl } from '@/core/consts'
@@ -38,6 +38,7 @@
 	import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
 	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
 	import { useLoginStore } from '@/core/store';
+	import { useShareHook } from '@/core/hooks';
 
 	interface QueryParams {
 		id : number;
@@ -122,14 +123,45 @@
 		}
 
 		/** 获取分享url */
-		getShareUrl(goodsDetail.data.id);
+		// getShareUrl(goodsDetail.data.id);  
+		// state.shareUrl = (await useShareHook().getShareUrl({
+		// 	client: ShareClientEnum.wxMiNiProgram,
+		// 	url: shareUrl,
+		// 	type: ShareModelEnum.url,
+		// 	page: ShareEnum.goods,
+		// 	params: { goodsId: goodsDetail.data.id, }
+		// }) as string);
+
+		// const { onShareAppMessage, onShareTimeline } = useShareHook().share({ title: 'xxx2', content: 'yyy2' }, { title: '哇哈哈2' });
 
 		/** 如果用户登录，获取购物车数量 */
 		if (uni.getStorageSync(UserToken)) {
 			getCartNum();
 		}
-	}
-
+		
+		
+		
+		
+	} 
+	
+	const { onShareAppMessage, onShareTimeline } = useShareHook().share({
+		title: state.goodsDetailData.name || '123123',
+		imageUrl: state.goodsDetailData.image || '123', 
+	});
+	
+	// onShareAppMessage(() => {
+	// 	return {
+	// 		title: state.goodsDetailData.name,
+	// 		imageUrl: state.goodsDetailData.image, 
+	// 	}
+	// });
+	// onShareTimeline(() => {
+	// 	return {
+	// 		title: state.goodsDetailData.name,
+	// 		imageUrl: state.goodsDetailData.image, 
+	// 	}
+	// })
+	
 	/** 获取购物车数量 */
 	const getCartNum = async () => {
 		const num : Response<number> = await queryCartNum();
@@ -210,27 +242,29 @@
 		}
 		const share = await queryShare(data);
 		if (share.status) {
-			state.shareUrl = share.data
+			state.shareUrl = share.data;
+
 		} else {
 			handleShowToast(share.msg);
 		}
 	}
 
-	/** 分享 */
-	onShareAppMessage(() => {
-		return {
-			title: state.goodsDetailData.name,
-			imageUrl: state.goodsDetailData.image,
-			path: state.shareUrl
-		}
-	});
-	onShareTimeline(() => {
-		return {
-			title: state.goodsDetailData.name,
-			imageUrl: state.goodsDetailData.image,
-			path: state.shareUrl
-		}
-	});
+	
+	// /** 分享 */
+	// onShareAppMessage(() => {
+	// 	return {
+	// 		title: state.goodsDetailData.name,
+	// 		imageUrl: state.goodsDetailData.image,
+	// 		path: state.shareUrl
+	// 	}
+	// });
+	// onShareTimeline(() => {
+	// 	return {
+	// 		title: state.goodsDetailData.name,
+	// 		imageUrl: state.goodsDetailData.image,
+	// 		path: state.shareUrl
+	// 	}
+	// });
 </script>
 
 <style lang="scss" scoped>

From 69f6439d06a7c9c964328f59ec1e48d5863c1bab Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Wed, 23 Oct 2024 00:04:50 +0800
Subject: [PATCH 04/15] =?UTF-8?q?uniapp=E3=80=90=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=EF=BC=88=E5=88=86=E4=BA=AB=E6=A8=A1=E5=9D=97=EF=BC=89?=
 =?UTF-8?q?=EF=BC=9A=E5=B0=81=E8=A3=85=E5=88=86=E4=BA=AB=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/core/hooks/index.ts              |   1 -
 .../CoreShop/core/hooks/use-share.ts          |  61 -----------
 .../CoreShop/core/utils/handle-share.ts       |  41 +++++++
 .../CoreShop/core/utils/index.ts              |   6 +-
 .../CoreShop/pages/goods/detail.vue           | 102 +++++-------------
 .../CoreShop/pages/home/home.vue              |  36 ++++++-
 .../CoreShop/pages/member/member.vue          |  23 +++-
 .../CoreShop/pages/share/jump/jump.vue        |  28 ++---
 .../activity/groupBuying/detail/detail.vue    |  37 +++----
 .../activity/pinTuan/detail/detail.vue        |  39 ++++++-
 .../activity/seckill/detail/detail.vue        |  37 +++----
 .../activity/solitaire/detail/detail.vue      |  35 ++----
 .../pages/subpackage/agency/index/index.vue   |  35 ++----
 .../pages/subpackage/agency/store/index.vue   |  45 +++-----
 .../subpackage/article/detail/detail.vue      |  51 ++++-----
 .../pages/subpackage/custom/custom.vue        |  36 ++++++-
 .../subpackage/distribution/index/index.vue   |  43 +++-----
 .../subpackage/distribution/store/index.vue   |  43 +++-----
 .../pages/subpackage/form/detail/detail.vue   |  36 ++-----
 .../pages/subpackage/notice/detail/detail.vue |  46 +++-----
 .../subpackage/serviceGoods/detail/detail.vue |  39 ++++++-
 21 files changed, 377 insertions(+), 443 deletions(-)
 delete mode 100644 CoreCms.Net.Uni-App/CoreShop/core/hooks/use-share.ts
 create mode 100644 CoreCms.Net.Uni-App/CoreShop/core/utils/handle-share.ts

diff --git a/CoreCms.Net.Uni-App/CoreShop/core/hooks/index.ts b/CoreCms.Net.Uni-App/CoreShop/core/hooks/index.ts
index 932f35ab..015a01b7 100644
--- a/CoreCms.Net.Uni-App/CoreShop/core/hooks/index.ts
+++ b/CoreCms.Net.Uni-App/CoreShop/core/hooks/index.ts
@@ -1,4 +1,3 @@
 /** 系统配置 */
 export * from './systemInfo';
 export * from './use-loading';
-export * from './use-share';
diff --git a/CoreCms.Net.Uni-App/CoreShop/core/hooks/use-share.ts b/CoreCms.Net.Uni-App/CoreShop/core/hooks/use-share.ts
deleted file mode 100644
index b3945b4a..00000000
--- a/CoreCms.Net.Uni-App/CoreShop/core/hooks/use-share.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
-import { queryShare } from '@/core/api';
-import { ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
-import { handleShowToast } from '@/core/utils';
-import { UserToken } from '@/core/consts';
-
-interface RequestParam {
-	client ?: ShareClientEnum;
-	url ?: string;
-	type ?: ShareModelEnum;
-	page ?: ShareEnum;
-	params ?: any;
-	token ?: string;
-}
-
-export const useShareHook = () => {
-
-	/** 获取分享url */
-	const getShareUrl = (requestParam : RequestParam) => {
-		return new Promise(async (resolve) => {
-			let data = requestParam;
-			if (uni.getStorageSync(UserToken)) {
-				data['token'] = uni.getStorageSync(UserToken)
-			}
-			const share = await queryShare(data);
-			if (share.status) {
-				resolve(share.data);
-			} else {
-				handleShowToast(share.msg);
-			}
-		})
-	}
-
-	const shareAppMessage = (options : Page.CustomShareContent) => {
-		onShareAppMessage(() => {
-			console.log('onShareAppMessage');
-			return {
-				...options
-			};
-		});
-		return { onShareAppMessage };
-	};
-
-	const shareTimeline = (options : Page.CustomShareContent) => {
-		onShareTimeline(() => {
-			console.log('shareTimeline');
-			return {
-				...options
-			};
-		});
-		return { onShareTimeline };
-	};
-
-	const share = (customShareContent : Page.CustomShareContent, shareTimelineContent ?: Page.CustomShareContent) => {
-		const { onShareAppMessage } = shareAppMessage(customShareContent);
-		const { onShareTimeline } = shareTimeline(shareTimelineContent ? shareTimelineContent : customShareContent);
-		return { onShareAppMessage, onShareTimeline };
-	};
-
-	return { share, getShareUrl, shareAppMessage, shareTimeline };
-};
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/core/utils/handle-share.ts b/CoreCms.Net.Uni-App/CoreShop/core/utils/handle-share.ts
new file mode 100644
index 00000000..736f27b9
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/core/utils/handle-share.ts
@@ -0,0 +1,41 @@
+import { ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
+import { UserToken } from '@/core/consts';
+import { queryShare } from '@/core/api';
+import { handleShowToast } from '@/core/utils';
+import { useShopConfigStore } from '@/core/store';
+
+interface RequestParam {
+	client : ShareClientEnum,
+	url : string,
+	type : ShareModelEnum,
+	page : ShareEnum,
+	params ?: any,
+	token ?: string
+}
+
+const getDefaultShareData = () => {
+	const shopConfigStore = useShopConfigStore();
+	return {
+		title: shopConfigStore.config?.shopName,
+		imageUrl: shopConfigStore.config?.shopLogo,
+		path: "/pages/home/home"
+	}
+}
+
+const getShareUrl = async (requestParam : RequestParam) => {
+	let data : RequestParam = requestParam;
+	if (uni.getStorageSync(UserToken)) {
+		data['token'] = uni.getStorageSync(UserToken)
+	}
+	const share = await queryShare(data);
+	if (share.status) {
+		return share.data;
+	} else {
+		handleShowToast(share.msg);
+	}
+}
+
+export {
+	getShareUrl,
+	getDefaultShareData,
+}
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/core/utils/index.ts b/CoreCms.Net.Uni-App/CoreShop/core/utils/index.ts
index 8eb5f04f..4d2aaa48 100644
--- a/CoreCms.Net.Uni-App/CoreShop/core/utils/index.ts
+++ b/CoreCms.Net.Uni-App/CoreShop/core/utils/index.ts
@@ -23,4 +23,8 @@ export * from './handle-toast';
 export * from './handle-advertise-detail';
 
 export * from './uni-promise';
-export * from './time-format';
\ No newline at end of file
+export * from './time-format';
+
+
+/** 处理分享 */
+export * from './handle-share';
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
index 70cdc3de..9c866f75 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
@@ -26,19 +26,18 @@
 
 <script setup lang="ts">
 	import { reactive } from 'vue';
-	import { onLoad , onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
-	import { queryGoodsDetail, queryCartNum, queryShare, queryGoodsDetailByToken, queryPromotionList, queryAddCart } from '@/core/api';
+	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
+	import { queryGoodsDetail, queryCartNum, queryGoodsDetailByToken, queryPromotionList, queryAddCart } from '@/core/api';
 	import type { Response, GoodsAgentListType, GoodsPromotionType, GoodsSkuListType } from "@/core/models";
 	import { PromotionEnum, AddCartEnum, PaymentTypeEnum, ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
 	import { UserToken, shareUrl } from '@/core/consts'
 	import { useCartStore } from '@/core/store';
-	import { handleRouteNavigateTo, handleShowToast } from '@/core/utils';
+	import { handleRouteNavigateTo, handleShowToast, getShareUrl } from '@/core/utils';
 	import GoodsDetail from '@/pages/components/goods-detail/index.vue';
 	import GoodsDetailBottomTabbar from '@/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue';
 	import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
 	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
 	import { useLoginStore } from '@/core/store';
-	import { useShareHook } from '@/core/hooks';
 
 	interface QueryParams {
 		id : number;
@@ -122,46 +121,21 @@
 			});
 		}
 
-		/** 获取分享url */
-		// getShareUrl(goodsDetail.data.id);  
-		// state.shareUrl = (await useShareHook().getShareUrl({
-		// 	client: ShareClientEnum.wxMiNiProgram,
-		// 	url: shareUrl,
-		// 	type: ShareModelEnum.url,
-		// 	page: ShareEnum.goods,
-		// 	params: { goodsId: goodsDetail.data.id, }
-		// }) as string);
-
-		// const { onShareAppMessage, onShareTimeline } = useShareHook().share({ title: 'xxx2', content: 'yyy2' }, { title: '哇哈哈2' });
-
+		/** 获取分享url */ 
+		state.shareUrl = await getShareUrl({
+			client: ShareClientEnum.wxMiNiProgram,
+			url: shareUrl,
+			type: ShareModelEnum.url,
+			page: ShareEnum.goods,
+			params: { goodsId: goodsDetail.data.id, }
+		}) 
+		
 		/** 如果用户登录，获取购物车数量 */
 		if (uni.getStorageSync(UserToken)) {
 			getCartNum();
 		}
-		
-		
-		
-		
-	} 
-	
-	const { onShareAppMessage, onShareTimeline } = useShareHook().share({
-		title: state.goodsDetailData.name || '123123',
-		imageUrl: state.goodsDetailData.image || '123', 
-	});
-	
-	// onShareAppMessage(() => {
-	// 	return {
-	// 		title: state.goodsDetailData.name,
-	// 		imageUrl: state.goodsDetailData.image, 
-	// 	}
-	// });
-	// onShareTimeline(() => {
-	// 	return {
-	// 		title: state.goodsDetailData.name,
-	// 		imageUrl: state.goodsDetailData.image, 
-	// 	}
-	// })
-	
+	}
+
 	/** 获取购物车数量 */
 	const getCartNum = async () => {
 		const num : Response<number> = await queryCartNum();
@@ -228,43 +202,21 @@
 		}
 	}
 
-	/** 获取分享url */
-	const getShareUrl = async (goodsId : number) => {
-		let data = {
-			client: ShareClientEnum.wxMiNiProgram,
-			url: shareUrl,
-			type: ShareModelEnum.url,
-			page: ShareEnum.goods,
-			params: { goodsId, }
+	/** 分享 */
+	onShareAppMessage(() => {
+		return {
+			title: state.goodsDetailData.name,
+			imageUrl: state.goodsDetailData.image,
+			path: state.shareUrl
 		}
-		if (uni.getStorageSync(UserToken)) {
-			data['token'] = uni.getStorageSync(UserToken)
+	});
+	onShareTimeline(() => {
+		return {
+			title: state.goodsDetailData.name,
+			imageUrl: state.goodsDetailData.image,
+			path: state.shareUrl
 		}
-		const share = await queryShare(data);
-		if (share.status) {
-			state.shareUrl = share.data;
-
-		} else {
-			handleShowToast(share.msg);
-		}
-	}
-
-	
-	// /** 分享 */
-	// onShareAppMessage(() => {
-	// 	return {
-	// 		title: state.goodsDetailData.name,
-	// 		imageUrl: state.goodsDetailData.image,
-	// 		path: state.shareUrl
-	// 	}
-	// });
-	// onShareTimeline(() => {
-	// 	return {
-	// 		title: state.goodsDetailData.name,
-	// 		imageUrl: state.goodsDetailData.image,
-	// 		path: state.shareUrl
-	// 	}
-	// });
+	});
 </script>
 
 <style lang="scss" scoped>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue b/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
index 456d1d71..760c7b28 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
@@ -25,15 +25,16 @@
 
 <script setup lang="ts">
 	import { onMounted, reactive, ref } from 'vue';
-	import { onPageScroll, onShow } from '@dcloudio/uni-app';
+	import { onPageScroll, onShow, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
 	import { queryPageConfig, queryUserInfo } from '@/core/api';
 	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, handleRouteNavigateTo } from '@/core/utils';
+	import { handleStaticResources, handleRouteNavigateTo, getShareUrl, getDefaultShareData } from '@/core/utils';
 	import { useSystemInfo, useLoadingFn } from '@/core/hooks';
-	import { UserToken, onHomePageShow } from '@/core/consts';
+	import { UserToken, onHomePageShow, shareUrl } from '@/core/consts';
 	import { useUserInfoStore, useShopConfigStore } from '@/core/store';
+	import { ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
 
 	/** 获取项目配置 */
 	const shopConfigStore = useShopConfigStore();
@@ -52,10 +53,12 @@
 		coreshopData : Array<PageConfigItemsType>;
 		isScrollTop : boolean;
 		showPage : boolean;
+		shareUrl : string;
 	}>({
 		coreshopData: [],
 		isScrollTop: false,
 		showPage: false,
+		shareUrl: "",
 	})
 
 	onShow(() => {
@@ -63,11 +66,18 @@
 		uni.$emit(onHomePageShow);
 	})
 
-	onMounted(() => {
+	onMounted(async () => {
 		handleuQueryPageConfig()
 		if (uni.getStorageSync(UserToken)) {
 			getUserInfo();
 		}
+
+		state.shareUrl = await getShareUrl({
+			client: ShareClientEnum.wxMiNiProgram,
+			url: shareUrl,
+			type: ShareModelEnum.url,
+			page: ShareEnum.index,
+		})
 	})
 
 	async function getPageConfig() {
@@ -82,7 +92,7 @@
 	/** 获取用户信息 */
 	const getUserInfo = async () => {
 		const userInfo : Response<UserInfoType> = await queryUserInfo();
-		if(userInfo.status){
+		if (userInfo.status) {
 			userInfoStore.setUserInfo(userInfo?.data);
 		}
 	}
@@ -91,6 +101,22 @@
 	const handleSearch = () => {
 		handleRouteNavigateTo('/pages/search/search')
 	}
+
+	/** 分享 */
+	onShareAppMessage(() => {
+		return {
+			title: getDefaultShareData().title,
+			imageUrl: getDefaultShareData().imageUrl,
+			path: state.shareUrl
+		}
+	});
+	onShareTimeline(() => {
+		return {
+			title: getDefaultShareData().title,
+			imageUrl: getDefaultShareData().imageUrl,
+			path: state.shareUrl
+		}
+	});
 </script>
 
 <style lang="scss" scoped>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue
index d301cfc2..e9121022 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue
@@ -164,8 +164,8 @@
 
 <script setup lang="ts">
 	import { reactive } from 'vue';
-	import { onPageScroll, onShow } from '@dcloudio/uni-app';
-	import { handleStaticResources, handleRouteNavigateTo, handleShowToast, handleRouteSwitchTab, hanldeShowModal } from '@/core/utils';
+	import { onPageScroll, onShow ,onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
+	import { handleStaticResources, handleRouteNavigateTo, handleShowToast, handleRouteSwitchTab, hanldeShowModal ,getDefaultShareData} from '@/core/utils';
 	import { queryUserInfo, queryOrderStatusNum, queryUserIsClerk, queryDistributionInfo, queryAgentInfo, queryShopConfigV2 } from '@/core/api';
 	import type { Response, MemberOrderType, UserInfoType, UserIsClerkType, MemberServiceType, ShopConfigType } from '@/core/models';
 	import { useShopConfigStore, useUserInfoStore, useLoginStore } from '@/core/store';
@@ -335,9 +335,24 @@
 				userInfoStore.setUserInfo({});
 				handleRouteSwitchTab(RouteSwitchTabEnum.home)
 			}
-		})
-
+		}) 
 	}
+	
+	/** 分享 */
+	onShareAppMessage(() => {
+		return {
+			title: getDefaultShareData().title,
+			imageUrl: getDefaultShareData().imageUrl,
+			path: 'pages/member/member'
+		}
+	});
+	onShareTimeline(() => {
+		return {
+			title: getDefaultShareData().title,
+			imageUrl: getDefaultShareData().imageUrl,
+			path: 'pages/member/member'
+		}
+	});
 </script>
 
 <style lang="scss" scoped>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue b/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
index 6ba70d99..3d328a97 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
@@ -2,7 +2,7 @@
 </template>
 <script setup lang="ts">
 	import { onLoad } from '@dcloudio/uni-app';
-	import { handleRouteSwitchTab, handleRouteNavigateTo, handleShowToast } from '@/core/utils';
+	import { handleRouteSwitchTab, handleRouteRedirectTo, handleShowToast } from '@/core/utils';
 	import { queryDeshare } from '@/core/api';
 	import type { Response } from '@/core/models';
 	import { Invitecode } from '@/core/consts';
@@ -22,17 +22,19 @@
 
 	const handleShare = async (code : string | number) => {
 		const shareData : Response<any> = await queryDeshare({ code, });
+		console.log('123',shareData)
+		
 		if (shareData.status) {
 			uni.setStorageSync(Invitecode, shareData.data?.userShareCode);
-			switch (shareData.data?.page) {
+			switch (Number(shareData.data?.page)) {
 				/** 首页*/
 				case ShareEnum.index:
 					handleRouteSwitchTab();
 					break;
 				/** 商品详情页*/
-				case ShareEnum.goods:
+				case ShareEnum.goods: 
 					if (shareData.data?.params?.goodsId) {
-						handleRouteNavigateTo(`/pages/goods/detail?id=${shareData.data?.params?.goodsId}`)
+						handleRouteRedirectTo(`/pages/goods/detail?id=${shareData.data?.params?.goodsId}`)
 					} else {
 						handleRouteSwitchTab();
 					}
@@ -40,7 +42,7 @@
 				/** 拼团详情页*/
 				case ShareEnum.pinTuan:
 					if (shareData.data?.params?.groupId && shareData.data?.params?.teamId) {
-						handleRouteNavigateTo(`/pages/subpackage/activity/pinTuan/detail/detail?id=${shareData.data?.params?.groupId}&teamId=${shareData.data?.params?.teamId}`)
+						handleRouteRedirectTo(`/pages/subpackage/activity/pinTuan/detail/detail?id=${shareData.data?.params?.groupId}&teamId=${shareData.data?.params?.teamId}`)
 					} else {
 						handleRouteSwitchTab();
 					}
@@ -52,7 +54,7 @@
 				/** 文章页面 */
 				case ShareEnum.article:
 					if (shareData.data?.params?.articleId) {
-						handleRouteNavigateTo(`/pages/subpackage/article/category/category?id=${shareData.data?.params?.articleId}&idType=${shareData.data?.params?.articleType}`)
+						handleRouteRedirectTo(`/pages/subpackage/article/category/category?id=${shareData.data?.params?.articleId}&idType=${shareData.data?.params?.articleType}`)
 					} else {
 						handleRouteSwitchTab();
 					}
@@ -60,7 +62,7 @@
 				/** 参团页面 */
 				case ShareEnum.addPinTuan:
 					if (shareData.data?.params?.groupId && shareData.data?.params?.teamId) {
-						handleRouteNavigateTo(`/pages/subpackage/activity/pinTuan/detail/detail?id=${shareData.data?.params?.groupId}&teamId=${shareData.data?.params?.teamId}`)
+						handleRouteRedirectTo(`/pages/subpackage/activity/pinTuan/detail/detail?id=${shareData.data?.params?.groupId}&teamId=${shareData.data?.params?.teamId}`)
 					} else {
 						handleRouteSwitchTab();
 					}
@@ -68,7 +70,7 @@
 				/** 自定义页面 */
 				case ShareEnum.page:
 					if (shareData.data?.params?.pageCode) {
-						handleRouteNavigateTo(`/pages/subpackage/custom/custom?code=${shareData.data?.params?.pageCode}`)
+						handleRouteRedirectTo(`/pages/subpackage/custom/custom?code=${shareData.data?.params?.pageCode}`)
 					} else {
 						handleRouteSwitchTab();
 					}
@@ -76,7 +78,7 @@
 				/** 智能表单 */
 				case ShareEnum.form:
 					if (shareData.data?.params?.id) {
-						handleRouteNavigateTo(`/pages/subpackage/form/detail/detail?id=${shareData.data?.params?.id}`)
+						handleRouteRedirectTo(`/pages/subpackage/form/detail/detail?id=${shareData.data?.params?.id}`)
 					} else {
 						handleRouteSwitchTab();
 					}
@@ -84,7 +86,7 @@
 				/** 团购 */
 				case ShareEnum.group:
 					if (shareData.data?.params?.groupId) {
-						handleRouteNavigateTo(`/pages/subpackage/activity/groupBuying/detail/detail?id=${shareData.data?.params?.groupId}`)
+						handleRouteRedirectTo(`/pages/subpackage/activity/groupBuying/detail/detail?id=${shareData.data?.params?.groupId}`)
 					} else {
 						handleRouteSwitchTab();
 					}
@@ -92,7 +94,7 @@
 				/** 秒杀 */
 				case ShareEnum.seckill:
 					if (shareData.data?.params?.groupId) {
-						handleRouteNavigateTo(`/pages/subpackage/activity/seckill/detail/detail?id=${shareData.data?.params?.groupId}`)
+						handleRouteRedirectTo(`/pages/subpackage/activity/seckill/detail/detail?id=${shareData.data?.params?.groupId}`)
 					} else {
 						handleRouteSwitchTab();
 					}
@@ -104,7 +106,7 @@
 				/** 接龙*/
 				case ShareEnum.solitaire:
 					if (shareData.data?.params?.id) {
-						handleRouteNavigateTo(`/pages/subpackage/activity/solitaire/detail/detail?id=${shareData.data?.params?.id}`)
+						handleRouteRedirectTo(`/pages/subpackage/activity/solitaire/detail/detail?id=${shareData.data?.params?.id}`)
 					} else {
 						handleRouteSwitchTab();
 					}
@@ -112,7 +114,7 @@
 				/** 服务商品*/
 				case ShareEnum.serviceGoods:
 					if (shareData.data?.params?.serviceGoodsId) {
-						handleRouteNavigateTo(`/pages/subpackage/serviceGoods/detail/detail?id=${shareData.data?.params?.serviceGoodsId}`)
+						handleRouteRedirectTo(`/pages/subpackage/serviceGoods/detail/detail?id=${shareData.data?.params?.serviceGoodsId}`)
 					} else {
 						handleRouteSwitchTab();
 					}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
index 264bdde1..7faa4a43 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
@@ -63,12 +63,12 @@
 <script setup lang="ts">
 	import { reactive, ref } from 'vue';
 	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
-	import { queryActivityDetial, queryCartNum, queryShare, queryAddCart } from '@/core/api';
+	import { queryActivityDetial, queryCartNum, queryAddCart } from '@/core/api';
 	import { PaymentTypeEnum, ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
 	import type { Response } from '@/core/models';
 	import { UserToken, shareUrl } from '@/core/consts'
 	import { useCartStore, useLoginStore } from '@/core/store';
-	import { handleShowToast, handleRouteNavigateTo } from '@/core/utils';
+	import { handleShowToast, handleRouteNavigateTo, getShareUrl } from '@/core/utils';
 	import GoodsDetail from '@/pages/components/goods-detail/index.vue';
 	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
 	import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
@@ -152,7 +152,16 @@
 		if (uni.getStorageSync(UserToken)) {
 			getCartNum();
 		}
-		getShareUrl();
+
+		state.shareUrl = await getShareUrl({
+			client: ShareClientEnum.wxMiNiProgram,
+			url: shareUrl,
+			type: ShareModelEnum.url,
+			page: ShareEnum.group,
+			params: {
+				groupId: state.id
+			}
+		})
 	}
 
 	/** 获取购物车数量 */
@@ -196,28 +205,6 @@
 		}
 	}
 
-	/** 获取分享url */
-	const getShareUrl = async () => {
-		let data = {
-			client: ShareClientEnum.wxMiNiProgram,
-			url: shareUrl,
-			type: ShareModelEnum.url,
-			page: ShareEnum.group,
-			params: {
-				groupId: state.id
-			}
-		}
-		if (uni.getStorageSync(UserToken)) {
-			data['token'] = uni.getStorageSync(UserToken)
-		}
-		const share = await queryShare(data);
-		if (share.status) {
-			state.shareUrl = share.data
-		} else {
-			handleShowToast(share.msg);
-		}
-	}
-
 	/** 分享 */
 	onShareAppMessage(() => {
 		return {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
index 3cbbb7de..61990c84 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
@@ -70,13 +70,13 @@
 </template>
 <script setup lang="ts">
 	import { reactive, ref } from 'vue';
-	import { onLoad } from '@dcloudio/uni-app';
+	import { onLoad ,onShareAppMessage,onShareTimeline} from '@dcloudio/uni-app';
 	import { queryPinTuanGoodsDetail, queryCartNum, queryAddCart, queryOrderPinTuanTeamInfo } from '@/core/api';
 	import type { Response } from '@/core/models';
-	import { UserToken } from '@/core/consts'
+	import { UserToken,shareUrl } from '@/core/consts'
 	import { useCartStore, useLoginStore } from '@/core/store';
-	import { PaymentTypeEnum, ShareEnum } from '@/core/enum';
-	import { handleRouteNavigateTo, handleShowToast } from '@/core/utils';
+	import { PaymentTypeEnum, ShareEnum,ShareClientEnum,ShareModelEnum } from '@/core/enum';
+	import { handleRouteNavigateTo, handleShowToast ,getShareUrl} from '@/core/utils';
 	import { deepClone } from '@/uni_modules/uv-ui-tools/libs/function/index.js';
 
 	import GoodsDetail from '@/pages/components/goods-detail/index.vue';
@@ -109,6 +109,7 @@
 		isSingleBuy : boolean;
 		btnBuyTitlt : string;
 		teamInfo : any;
+		shareUrl:string;
 	}>({
 		id: 0,
 		goodsDetailData: {},
@@ -122,6 +123,7 @@
 		isSingleBuy: true,
 		btnBuyTitlt: "发起拼团",
 		teamInfo: {},
+		shareUrl:"",
 	});
 
 	const loading = ref(false);
@@ -129,6 +131,7 @@
 
 	onLoad((query : QueryParams) => {
 		if (query?.teamId) {
+			state.teamId = query?.teamId;
 			state.goodsDetailData = {
 				teamId: query?.teamId
 			};
@@ -172,6 +175,18 @@
 		if (uni.getStorageSync(UserToken)) {
 			getCartNum();
 		}
+		
+		state.shareUrl = await getShareUrl({
+			client: ShareClientEnum.wxMiNiProgram,
+			url: shareUrl,
+			type: ShareModelEnum.url,
+			page: ShareEnum.pinTuan,
+			params: {
+				groupId: state.id,
+				goodsId: state.goodsDetailData.id,
+				teamId: state.teamId
+			}
+		})
 	}
 
 	/** 获取通过分享进来的拼团数据 */
@@ -266,6 +281,22 @@
 			handleShowToast(addCart.msg);
 		}
 	}
+	
+	/** 分享 */
+	onShareAppMessage(() => {
+		return {
+			title: state.goodsDetailData.name,
+			imageUrl: state.goodsDetailData.image,
+			path: state.shareUrl
+		}
+	});
+	onShareTimeline(() => {
+		return {
+			title: state.goodsDetailData.name,
+			imageUrl: state.goodsDetailData.image,
+			path: state.shareUrl
+		}
+	});
 </script>
 <style lang="scss" scoped>
 	@import './detail.scss';
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
index d1bc198f..e2286480 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
@@ -62,12 +62,12 @@
 <script setup lang="ts">
 	import { reactive, ref } from 'vue';
 	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
-	import { queryActivityDetial, queryCartNum, queryShare, queryAddCart, queryUserInfo } from '@/core/api';
+	import { queryActivityDetial, queryCartNum, queryShare, queryAddCart } from '@/core/api';
 	import { PaymentTypeEnum, ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
 	import type { Response } from '@/core/models';
 	import { UserToken, shareUrl } from '@/core/consts'
 	import { useCartStore, useLoginStore } from '@/core/store';
-	import { handleShowToast, handleRouteNavigateTo } from '@/core/utils';
+	import { handleShowToast, handleRouteNavigateTo, getShareUrl } from '@/core/utils';
 
 	import GoodsDetail from '@/pages/components/goods-detail/index.vue';
 	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
@@ -152,7 +152,16 @@
 		if (uni.getStorageSync(UserToken)) {
 			getCartNum();
 		}
-		getShareUrl();
+
+		state.shareUrl = await getShareUrl({
+			client: ShareClientEnum.wxMiNiProgram,
+			url: shareUrl,
+			type: ShareModelEnum.url,
+			page: ShareEnum.seckill,
+			params: {
+				groupId: state.id
+			}
+		})
 	}
 
 	/** 获取购物车数量 */
@@ -196,28 +205,6 @@
 		}
 	}
 
-	/** 获取分享url */
-	const getShareUrl = async () => {
-		let data = {
-			client: ShareClientEnum.wxMiNiProgram,
-			url: shareUrl,
-			type: ShareModelEnum.url,
-			page: ShareEnum.seckill,
-			params: {
-				groupId: state.id
-			}
-		}
-		if (uni.getStorageSync(UserToken)) {
-			data['token'] = uni.getStorageSync(UserToken)
-		}
-		const share = await queryShare(data);
-		if (share.status) {
-			state.shareUrl = share.data
-		} else {
-			handleShowToast(share.msg);
-		}
-	}
-
 	/** 分享 */
 	onShareAppMessage(() => {
 		return {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/solitaire/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/solitaire/detail/detail.vue
index 4a0253d6..581fb0a1 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/solitaire/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/solitaire/detail/detail.vue
@@ -103,7 +103,7 @@
 	import type { Response } from '@/core/models';
 	import { UserToken, shareUrl } from '@/core/consts'
 	import { useShopConfigStore, useLoginStore } from '@/core/store';
-	import { handleShowToast, handleRouteNavigateTo } from '@/core/utils';
+	import { handleShowToast, handleRouteNavigateTo, getShareUrl } from '@/core/utils';
 	import { timeFormat } from '@/uni_modules/uv-ui-tools/libs/function/index.js';
 	import CoreshopShare from '@/components/coreshop-share/coreshop-share.vue';
 
@@ -154,7 +154,16 @@
 		} else {
 			handleShowToast(solitaireData.msg)
 		}
-		getShareUrl();
+
+		state.shareUrl = await getShareUrl({
+			client: ShareClientEnum.wxMiNiProgram,
+			url: shareUrl,
+			type: ShareModelEnum.url,
+			page: ShareEnum.solitaire,
+			params: {
+				id: state.solitaireInfo.id
+			}
+		})
 	}
 
 	/** 步进器变化 */
@@ -232,28 +241,6 @@
 		}
 	}
 
-	/** 获取分享url */
-	const getShareUrl = async () => {
-		let data = {
-			client: ShareClientEnum.wxMiNiProgram,
-			url: shareUrl,
-			type: ShareModelEnum.url,
-			page: ShareEnum.solitaire,
-			params: {
-				id: state.solitaireInfo.id
-			}
-		}
-		if (uni.getStorageSync(UserToken)) {
-			data['token'] = uni.getStorageSync(UserToken)
-		}
-		const share = await queryShare(data);
-		if (share.status) {
-			state.shareUrl = share.data
-		} else {
-			handleShowToast(share.msg);
-		}
-	}
-
 	/** 分享弹框显示与否 */
 	const handleToggleShowShare = () => {
 		_useLoginStore.checkLogin(() => {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/index/index.vue
index 926bcb12..4a4cad4e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/index/index.vue
@@ -123,7 +123,7 @@
 <script setup lang="ts">
 	import { reactive } from 'vue';
 	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
-	import { handleStaticResources, handleRouteNavigateTo, handleRouteRedirectTo, handleShowToast } from '@/core/utils';
+	import { handleStaticResources, handleRouteNavigateTo, handleRouteRedirectTo, handleShowToast, getShareUrl } from '@/core/utils';
 	import { useShopConfigStore } from '@/core/store';
 	import type { Response, UserInfoType } from '@/core/models';
 	import { queryAgentInfo, queryUserInfo, queryShare } from '@/core/api';
@@ -165,7 +165,16 @@
 			if (info.data?.verifyStatus != AgentApplyStatus.success) {
 				handleRouteRedirectTo('/pages/subpackage/distribution/apply/index');
 			}
-			getShareUrl();
+
+			state.shareUrl = await getShareUrl({
+				client: ShareClientEnum.wxMiNiProgram,
+				url: shareUrl,
+				type: ShareModelEnum.url,
+				page: ShareEnum.inv,
+				params: {
+					store: state.info.store
+				}
+			})
 		} else {
 			handleShowToast(info.msg)
 		}
@@ -195,28 +204,6 @@
 		}
 	}
 
-	/** 获取分享url */
-	const getShareUrl = async () => {
-		let data = {
-			client: ShareClientEnum.wxMiNiProgram,
-			url: shareUrl,
-			type: ShareModelEnum.url,
-			page: ShareEnum.inv,
-			params: {
-				store: state.info.store
-			}
-		}
-		if (uni.getStorageSync(UserToken)) {
-			data['token'] = uni.getStorageSync(UserToken)
-		}
-		const share = await queryShare(data);
-		if (share.status) {
-			state.shareUrl = share.data
-		} else {
-			handleShowToast(share.msg);
-		}
-	}
-
 	/** 分享 */
 	onShareAppMessage(() => {
 		return {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/store/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/store/index.vue
index b2010699..36fdc422 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/store/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/agency/store/index.vue
@@ -78,7 +78,7 @@
 	import { reactive } from 'vue';
 	import { onLoad, onReachBottom, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
 	import { queryAgentStoreInfot, queryShare, queryAgentGoodsPageList } from '@/core/api';
-	import { handleStaticResources, splitArrayByStep, handleShowToast, handleRouteNavigateTo } from '@/core/utils';
+	import { handleStaticResources, splitArrayByStep, handleShowToast, handleRouteNavigateTo, getShareUrl } from '@/core/utils';
 	import type { Response, GoodsType } from '@/core/models';
 	import { ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
 	import { shareUrl, UserToken } from '@/core/consts';
@@ -112,11 +112,20 @@
 		bannerList: [],
 	})
 
-	onLoad((query : QueryParams) => {
+	onLoad(async (query : QueryParams) => {
 		state.storeId = query.store;
 		getAgentInfo();
-		getShareUrl();
 		getGoodsPageList();
+
+		state.shareUrl = await getShareUrl({
+			client: ShareClientEnum.wxMiNiProgram,
+			url: shareUrl,
+			type: ShareModelEnum.url,
+			page: ShareEnum.agent,
+			params: {
+				store: state.storeId
+			}
+		})
 	})
 
 	onReachBottom(() => {
@@ -201,40 +210,18 @@
 		}
 	}
 
-	/** 获取分享url */
-	const getShareUrl = async () => {
-		let data = {
-			client: ShareClientEnum.wxMiNiProgram,
-			url: shareUrl,
-			type: ShareModelEnum.url,
-			page: ShareEnum.agent,
-			params: {
-				store: state.storeId
-			}
-		}
-		if (uni.getStorageSync(UserToken)) {
-			data['token'] = uni.getStorageSync(UserToken)
-		}
-		const share = await queryShare(data);
-		if (share.status) {
-			state.shareUrl = share.data
-		} else {
-			handleShowToast(share.msg);
-		}
-	}
-
 	/** 分享 */
 	onShareAppMessage(() => {
 		return {
-			title: shopConfigStore.config.shareTitle,
-			imageUrl: shopConfigStore.config.shareImage,
+			title: state.storeInfo?.storeName ? state.storeInfo?.storeName : shopConfigStore.config.shareTitle,
+			imageUrl: state.storeInfo?.storeLogo ? state.storeInfo?.storeLogo : shopConfigStore.config.shareImage,
 			path: state.shareUrl
 		}
 	});
 	onShareTimeline(() => {
 		return {
-			title: shopConfigStore.config.shareTitle,
-			imageUrl: shopConfigStore.config.shareImage,
+			title: state.storeInfo?.storeName ? state.storeInfo?.storeName : shopConfigStore.config.shareTitle,
+			imageUrl: state.storeInfo?.storeLogo ? state.storeInfo?.storeLogo : shopConfigStore.config.shareImage,
 			path: state.shareUrl
 		}
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/article/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/article/detail/detail.vue
index 601eb1fe..42257a21 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/article/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/article/detail/detail.vue
@@ -16,7 +16,7 @@
 	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
 	import { queryArticleDetail, queryShare, queryNoticeInfo, queryMessageDetil } from '@/core/api';
 	import type { Response, NoticeType } from '@/core/models';
-	import { handleShowToast, handleRouteSwitchTab } from '@/core/utils';
+	import { handleShowToast, handleRouteSwitchTab ,getShareUrl} from '@/core/utils';
 	import { ShareClientEnum, ShareModelEnum, ShareEnum, ArticleDetailEnum } from '@/core/enum';
 	import { UserToken, shareUrl } from '@/core/consts'
 
@@ -30,15 +30,16 @@
 		idType : number;
 		id : number;
 		title : string;
+		shareUrl:string;
 	}>({
 		articleDetail: {},
 		idType: 1,
 		id: 0,
-		title: "文章详情"
-
+		title: "文章详情",
+		shareUrl:"", 
 	})
 
-	onLoad((query : QueryParams) => {
+	onLoad(async (query : QueryParams) => {
 		state.idType = query?.idType || 1;
 		state.id = query?.id || 0;
 
@@ -59,8 +60,17 @@
 				handleRouteSwitchTab();
 			})
 		}
-		/** 获取分享url */
-		getShareUrl();
+		/** 获取分享url */ 
+		state.shareUrl = await getShareUrl({
+			client: ShareClientEnum.wxMiNiProgram,
+			url: shareUrl,
+			type: ShareModelEnum.url,
+			page: ShareEnum.article,
+			params: {
+				articleId: state.id,
+				articleType: state.idType
+			}
+		})
 	})
 
 	/** 获取文章详情 */
@@ -103,41 +113,18 @@
 		} else {
 			handleShowToast(articleDetail.msg)
 		}
-	}
-
-	/** 获取分享url */
-	const getShareUrl = async () => {
-		let data = {
-			client: ShareClientEnum.wxMiNiProgram,
-			url: shareUrl,
-			type: ShareModelEnum.url,
-			page: ShareEnum.article,
-			params: {
-				articleId: state.id,
-				articleType: state.idType
-			}
-		}
-		if (uni.getStorageSync(UserToken)) {
-			data['token'] = uni.getStorageSync(UserToken)
-		}
-		const share = await queryShare(data);
-		if (share.status) {
-			state.shareUrl = share.data
-		} else {
-			handleShowToast(share.msg);
-		}
-	}
+	} 
 
 	/** 分享 */
 	onShareAppMessage(() => {
 		return {
-			title: state.noticeInfo.name,
+			title: state.articleDetail.title,
 			path: state.shareUrl
 		}
 	});
 	onShareTimeline(() => {
 		return {
-			title: state.noticeInfo.name,
+			title: state.articleDetail.title,
 			path: state.shareUrl
 		}
 	});
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 8bfc6c25..1729651f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/custom/custom.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/custom/custom.vue
@@ -32,16 +32,17 @@
 </template>
 
 <script setup lang="ts">
-	import { onPageScroll, onLoad } from '@dcloudio/uni-app';
+	import { onPageScroll, onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
 	import { reactive } from 'vue';
 	import { queryPageConfig, queryUserInfo } from '@/core/api';
 	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';
+	import { handleStaticResources, getDefaultShareData, getShareUrl } from '@/core/utils';
 	import { useSystemInfo } from '@/core/hooks';
-	import { UserToken } from '@/core/consts';
+	import { UserToken, shareUrl } from '@/core/consts';
 	import { useUserInfoStore } from '@/core/store';
+	import { ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
 
 	interface QueryParams {
 		code : string;
@@ -55,9 +56,11 @@
 	const state = reactive<{
 		coreshopData : Array<PageConfigItemsType>;
 		isScrollTop : boolean;
+		shareUrl : string;
 	}>({
 		coreshopData: [],
 		isScrollTop: false,
+		shareUrl: "",
 	})
 
 	onPageScroll((e : any) => {
@@ -68,11 +71,18 @@
 		}
 	})
 
-	onLoad((query : QueryParams) => {
+	onLoad(async (query : QueryParams) => {
 		getPageConfig(query?.code);
 		if (uni.getStorageSync(UserToken)) {
 			getUserInfo();
 		}
+
+		state.shareUrl = await getShareUrl({
+			client: ShareClientEnum.wxMiNiProgram,
+			url: shareUrl,
+			type: ShareModelEnum.url,
+			page: ShareEnum.index,
+		})
 	})
 
 	const getPageConfig = async (code : string) => {
@@ -83,10 +93,26 @@
 	/** 获取用户信息 */
 	const getUserInfo = async () => {
 		const userInfo : Response<UserInfoType> = await queryUserInfo();
-		if(userInfo.status){
+		if (userInfo.status) {
 			userInfoStore.setUserInfo(userInfo?.data);
 		}
 	}
+
+	/** 分享 */
+	onShareAppMessage(() => {
+		return {
+			title: getDefaultShareData().title,
+			imageUrl: getDefaultShareData().imageUrl,
+			path: state.shareUrl
+		}
+	});
+	onShareTimeline(() => {
+		return {
+			title: getDefaultShareData().title,
+			imageUrl: getDefaultShareData().imageUrl,
+			path: state.shareUrl
+		}
+	});
 </script>
 
 <style lang="scss" scoped>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/index/index.vue
index 315e175f..19e216a2 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/index/index.vue
@@ -126,7 +126,7 @@
 	import { reactive } from 'vue';
 	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
 	import { queryDistributionInfo, queryUserInfo, queryShare } from '@/core/api';
-	import { handleShowToast, handleStaticResources, handleRouteNavigateTo, handleRouteRedirectTo } from '@/core/utils';
+	import { handleShowToast, handleStaticResources, handleRouteNavigateTo, handleRouteRedirectTo, getShareUrl } from '@/core/utils';
 	import type { Response, UserInfoType } from '@/core/models';
 	import { DistributionApplyStatus, OpenDistributionEnum, ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
 	import { useShopConfigStore } from '@/core/store';
@@ -167,7 +167,16 @@
 			if (info.data?.verifyStatus != DistributionApplyStatus.success) {
 				handleRouteRedirectTo('/pages/subpackage/distribution/apply/index');
 			}
-			getShareUrl();
+
+			state.shareUrl = await getShareUrl({
+				client: ShareClientEnum.wxMiNiProgram,
+				url: shareUrl,
+				type: ShareModelEnum.url,
+				page: ShareEnum.inv,
+				params: {
+					store: state.info.store
+				}
+			})
 		} else {
 			handleShowToast(info.msg)
 		}
@@ -196,40 +205,18 @@
 		}
 	}
 
-	/** 获取分享url */
-	const getShareUrl = async () => {
-		let data = {
-			client: ShareClientEnum.wxMiNiProgram,
-			url: shareUrl,
-			type: ShareModelEnum.url,
-			page: ShareEnum.inv,
-			params: {
-				store: state.info.store
-			}
-		}
-		if (uni.getStorageSync(UserToken)) {
-			data['token'] = uni.getStorageSync(UserToken)
-		}
-		const share = await queryShare(data);
-		if (share.status) {
-			state.shareUrl = share.data
-		} else {
-			handleShowToast(share.msg);
-		}
-	}
-
 	/** 分享 */
 	onShareAppMessage(() => {
 		return {
-			title: shopConfigStore.config.shareTitle,
-			imageUrl: shopConfigStore.config.shareImage,
+			title: state.info?.storeName ? state.info?.storeName : shopConfigStore.config.shareTitle,
+			imageUrl: state.info?.storeLogo ? state.info?.storeLogo : shopConfigStore.config.shareImage,
 			path: state.shareUrl
 		}
 	});
 	onShareTimeline(() => {
 		return {
-			title: shopConfigStore.config.shareTitle,
-			imageUrl: shopConfigStore.config.shareImage,
+			title: state.info?.storeName ? state.info?.storeName : shopConfigStore.config.shareTitle,
+			imageUrl: state.info?.storeLogo ? state.info?.storeLogo : shopConfigStore.config.shareImage,
 			path: state.shareUrl
 		}
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store/index.vue
index 57905da4..46084fd7 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store/index.vue
@@ -112,11 +112,20 @@
 		bannerList: [],
 	})
 
-	onLoad((query : QueryParams) => {
+	onLoad(async (query : QueryParams) => {
 		state.storeId = query.store;
 		getDistributionInfo();
-		getShareUrl();
 		getGoodsPageList();
+
+		state.shareUrl = await getShareUrl({
+			client: ShareClientEnum.wxMiNiProgram,
+			url: shareUrl,
+			type: ShareModelEnum.url,
+			page: ShareEnum.inv,
+			params: {
+				store: state.storeId
+			}
+		})
 	})
 
 	onReachBottom(() => {
@@ -201,40 +210,18 @@
 		}
 	}
 
-	/** 获取分享url */
-	const getShareUrl = async () => {
-		let data = {
-			client: ShareClientEnum.wxMiNiProgram,
-			url: shareUrl,
-			type: ShareModelEnum.url,
-			page: ShareEnum.inv,
-			params: {
-				store: state.storeId
-			}
-		}
-		if (uni.getStorageSync(UserToken)) {
-			data['token'] = uni.getStorageSync(UserToken)
-		}
-		const share = await queryShare(data);
-		if (share.status) {
-			state.shareUrl = share.data
-		} else {
-			handleShowToast(share.msg);
-		}
-	}
-
 	/** 分享 */
 	onShareAppMessage(() => {
 		return {
-			title: shopConfigStore.config.shareTitle,
-			imageUrl: shopConfigStore.config.shareImage,
+			title: state.storeInfo?.storeName ? state.storeInfo?.storeName : shopConfigStore.config.shareTitle,
+			imageUrl: state.storeInfo?.storeLogo ? state.storeInfo?.storeLogo : shopConfigStore.config.shareImage,
 			path: state.shareUrl
 		}
 	});
 	onShareTimeline(() => {
 		return {
-			title: shopConfigStore.config.shareTitle,
-			imageUrl: shopConfigStore.config.shareImage,
+			title: state.storeInfo?.storeName ? state.storeInfo?.storeName : shopConfigStore.config.shareTitle,
+			imageUrl: state.storeInfo?.storeLogo ? state.storeInfo?.storeLogo : shopConfigStore.config.shareImage,
 			path: state.shareUrl
 		}
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/form/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/form/detail/detail.vue
index 4727b79d..35493629 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/form/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/form/detail/detail.vue
@@ -138,9 +138,9 @@
 <script setup lang="ts">
 	import { reactive, ref } from 'vue';
 	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
-	import { queryFormDetial, queryUploadImages, queryAddSubmit, queryShare } from '@/core/api';
+	import { queryFormDetial, queryUploadImages, queryAddSubmit } from '@/core/api';
 	import type { Response, CityAddressType } from '@/core/models';
-	import { handleShowToast, handleStaticResources, handleRouteRedirectTo, handleRouteSwitchTab, chooseImage, getSetting } from '@/core/utils';
+	import { handleShowToast, handleStaticResources, handleRouteRedirectTo, handleRouteSwitchTab, chooseImage, getSetting, getShareUrl } from '@/core/utils';
 	import { queryAreas } from '@/core/api';
 	import { useLoginStore } from '@/core/store';
 	import { UserToken, shareUrl } from '@/core/consts';
@@ -244,34 +244,20 @@
 			state.swiperList = formInfo.data?.images?.split(',') || [];
 
 			/** 获取分享url */
-			getShareUrl();
+			state.shareUrl = await getShareUrl({
+				client: ShareClientEnum.wxMiNiProgram,
+				url: shareUrl,
+				type: ShareModelEnum.url,
+				page: ShareEnum.form,
+				params: {
+					id: state.id
+				}
+			})
 		} else {
 			handleShowToast(formInfo.msg)
 		}
 	}
 
-	/** 获取分享url */
-	const getShareUrl = async () => {
-		let data = {
-			client: ShareClientEnum.wxMiNiProgram,
-			url: shareUrl,
-			type: ShareModelEnum.url,
-			page: ShareEnum.form,
-			params: {
-				id: state.id
-			}
-		}
-		if (uni.getStorageSync(UserToken)) {
-			data['token'] = uni.getStorageSync(UserToken)
-		}
-		const share = await queryShare(data);
-		if (share.status) {
-			state.shareUrl = share.data
-		} else {
-			handleShowToast(share.msg);
-		}
-	}
-
 	/** 组合商品数据传入组件 */
 	const hanldeCombinationGoodsData = (item : any) => {
 		return {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/notice/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/notice/detail/detail.vue
index 7e930713..24222087 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/notice/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/notice/detail/detail.vue
@@ -14,26 +14,36 @@
 <script setup lang="ts">
 	import { reactive } from 'vue';
 	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
-	import { queryNoticeInfo, queryShare } from '@/core/api';
+	import { queryNoticeInfo } from '@/core/api';
 	import type { Response, NoticeType } from '@/core/models';
-	import { handleShowToast } from '@/core/utils';
+	import { handleShowToast, getShareUrl } from '@/core/utils';
 	import { ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
-	import { UserToken, shareUrl } from '@/core/consts'
+	import { shareUrl } from '@/core/consts'
 
 	interface QueryParams {
 		id : number;
 	}
 	const state = reactive<{
 		noticeInfo : NoticeType;
+		shareUrl : string;
 	}>({
 		noticeInfo: {},
+		shareUrl: "",
 	})
 
-	onLoad((query : QueryParams) => {
+	onLoad(async (query : QueryParams) => {
 		/** 获取文章详情 */
 		getNoticeInfo(Number(query.id));
 		/** 获取分享url */
-		getShareUrl(Number(query.id));
+		state.shareUrl = await getShareUrl({
+			client: ShareClientEnum.wxMiNiProgram,
+			url: shareUrl,
+			type: ShareModelEnum.url,
+			page: ShareEnum.article,
+			params: {
+				noticeId: String(query.id),
+			}
+		})
 	})
 
 	/** 获取文章详情 */
@@ -50,38 +60,16 @@
 		}
 	}
 
-	/** 获取分享url */
-	const getShareUrl = async (noticeId : number) => {
-		let data = {
-			client: ShareClientEnum.wxMiNiProgram,
-			url: shareUrl,
-			type: ShareModelEnum.url,
-			page: ShareEnum.article,
-			params: {
-				noticeId: String(noticeId),
-			}
-		}
-		if (uni.getStorageSync(UserToken)) {
-			data['token'] = uni.getStorageSync(UserToken)
-		}
-		const share = await queryShare(data);
-		if (share.status) {
-			state.shareUrl = share.data
-		} else {
-			handleShowToast(share.msg);
-		}
-	}
-
 	/** 分享 */
 	onShareAppMessage(() => {
 		return {
-			title: state.noticeInfo.name,
+			title: state.noticeInfo.title,
 			path: state.shareUrl
 		}
 	});
 	onShareTimeline(() => {
 		return {
-			title: state.noticeInfo.name,
+			title: state.noticeInfo.title,
 			path: state.shareUrl
 		}
 	});
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/serviceGoods/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/serviceGoods/detail/detail.vue
index 2c554a26..e67dea0f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/serviceGoods/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/serviceGoods/detail/detail.vue
@@ -82,16 +82,17 @@
 </template>
 <script setup lang="ts">
 	import { reactive } from 'vue';
-	import { onLoad } from '@dcloudio/uni-app';
+	import { onLoad ,onShareAppMessage,onShareTimeline} from '@dcloudio/uni-app';
 	import type { Response, ServiceGoodsType } from '@/core/models';
 	import { queryServiceDetail, queryAddServiceOrder } from '@/core/api';
-	import { ServiceGoodsOpenEnum, ShareEnum, PaymentTypeEnum } from '@/core/enum';
-	import { handleShowToast, handleRouteNavigateTo } from '@/core/utils';
-	import { useUserInfoStore, useLoginStore } from '@/core/store';
+	import { ServiceGoodsOpenEnum, ShareEnum, PaymentTypeEnum, ShareClientEnum, ShareModelEnum, } from '@/core/enum';
+	import { handleShowToast, handleRouteNavigateTo,getShareUrl } from '@/core/utils';
+	import { useLoginStore } from '@/core/store';
+	import { shareUrl } from '@/core/consts';
 	import GoodsDetail from '@/pages/components/goods-detail/index.vue';
 	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
 	import GoodsDetailBottomTabbar from '@/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue';
-
+	
 	interface QueryParams {
 		id : number;
 	}
@@ -104,11 +105,13 @@
 		goodsDetailData : ServiceGoodsType,
 		swiperBanner : Array<string>;
 		goodsDetailContent : string;
+		shareUrl:string;
 	}>({
 		id: 0,
 		goodsDetailData: {},
 		swiperBanner: [],
 		goodsDetailContent: "",
+		shareUrl:"",
 	});
 
 	onLoad((query : QueryParams) => {
@@ -138,6 +141,16 @@
 			state.swiperBanner = goodsDetail?.data?.thumbnail?.split(',');
 			/** 商品详情内容 */
 			state.goodsDetailContent = goodsDetail?.data?.contentBody;
+			
+			state.shareUrl = await getShareUrl({
+				client: ShareClientEnum.wxMiNiProgram,
+				url: shareUrl,
+				type: ShareModelEnum.url,
+				page: ShareEnum.serviceGoods,
+				params: {
+					serviceGoodsId: state.id,
+				}
+			})
 		} else {
 			handleShowToast(goodsDetail.msg)
 		}
@@ -160,6 +173,22 @@
 			}
 		})
 	}
+	
+	/** 分享 */
+	onShareAppMessage(() => {
+		return {
+			title: state.goodsDetailData.title,
+			imageUrl: state.goodsDetailData.thumbnail,
+			path: state.shareUrl
+		}
+	});
+	onShareTimeline(() => {
+		return {
+			title: state.goodsDetailData.title,
+			imageUrl: state.goodsDetailData.thumbnail,
+			path: state.shareUrl
+		}
+	});
 </script>
 <style lang="scss" scoped>
 	@import './detail.scss';

From bad96fa0e45deb5e305d835fa904fd9944295a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?21=E4=B8=96=E7=BA=AA=E5=B0=8F=E5=85=AB=E8=B7=AF?=
 <2529156631@qq.com>
Date: Tue, 22 Oct 2024 00:27:17 +0800
Subject: [PATCH 05/15] =?UTF-8?q?uniapp=E3=80=90=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=91=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5=E5=AF=BC?=
 =?UTF-8?q?=E8=A1=8C=E6=A0=8F=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/components/coreshop-navbar/coreshop-navbar.vue | 4 +++-
 .../coreshop-page-content/coreshop-page-content.vue         | 2 +-
 CoreCms.Net.Uni-App/CoreShop/core/hooks/systemInfo.ts       | 6 +++++-
 CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.scss           | 2 +-
 CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue            | 2 +-
 CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue    | 2 +-
 CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue         | 5 ++++-
 CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue            | 2 +-
 CoreCms.Net.Uni-App/CoreShop/pages/member/member.scss       | 6 +++---
 CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue        | 4 ++--
 CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.scss | 2 +-
 .../pages/subpackage/activity/groupBuying/detail/detail.vue | 6 ++++--
 .../pages/subpackage/activity/pinTuan/detail/detail.vue     | 6 ++++--
 .../pages/subpackage/activity/pinTuan/list/list.scss        | 3 +--
 .../pages/subpackage/activity/seckill/detail/detail.vue     | 6 ++++--
 .../pages/subpackage/activity/seckill/list/list.scss        | 5 +++--
 16 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
index 2543d339..7b124362 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
@@ -1,5 +1,5 @@
 <template>
-	<uv-navbar :bgColor="props.bgColor">
+	<uv-navbar :bgColor="props.bgColor" placeholder :height="menuButtonHeight+'px'">
 		<template #left>
 			<view class="page-back">
 				<image v-if="props.isBack" @click="hanlderBack" class="back"
@@ -15,7 +15,9 @@
 </template>
 
 <script setup lang="ts">
+	import { useSystemInfo } from '@/core/hooks';
 	import { handleStaticResources } from '@/core/utils';
+	const { menuButtonHeight } = useSystemInfo();
 
 	const props = withDefaults(defineProps<{
 		isBack : boolean,
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue
index 013a4e51..ba7318ed 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue
@@ -3,7 +3,7 @@
 		<coreshop-navbar :isBack="props.isBack" :bgColor="props.bgColor" :mode="props.mode" :title="props.title"
 			:titleColor="props.titleColor" :handleCustomRouteJump="props.handleCustomRouteJump"></coreshop-navbar>
 		<view class="layout-page-content"
-			:style="{ 'padding-top': `${props.isShowStatusBarHeight ? statusBarHeight : 0}px`, ...props.contentStyle }">
+			:style="{ ...props.contentStyle }">
 			<slot></slot>
 		</view>
 		<template v-if="props.showLoginModalDom">
diff --git a/CoreCms.Net.Uni-App/CoreShop/core/hooks/systemInfo.ts b/CoreCms.Net.Uni-App/CoreShop/core/hooks/systemInfo.ts
index 74082e7c..a303386a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/core/hooks/systemInfo.ts
+++ b/CoreCms.Net.Uni-App/CoreShop/core/hooks/systemInfo.ts
@@ -4,16 +4,20 @@ export const useSystemInfo = () => {
 	const state = reactive<{
 		systemInfo : any;
 		statusBarHeight : number;
+		menuButtonHeight : number;
 	}>({
 		systemInfo: {},
 		statusBarHeight: 0,
+		menuButtonHeight: 44
 	});
 
 
 	onMounted(async () => {
+		const menuButton = uni.getMenuButtonBoundingClientRect();
 		const systemInfo = await uni.getSystemInfo();
 		state.systemInfo = systemInfo;
-		state.statusBarHeight = systemInfo.statusBarHeight + systemInfo.safeArea.top;
+		state.menuButtonHeight = menuButton.height + (menuButton.top - systemInfo.statusBarHeight) * 2;
+		state.statusBarHeight = systemInfo.statusBarHeight + state.menuButtonHeight;
 	})
 
 	return toRefs(state);
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.scss b/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.scss
index 2272185a..c78133f3 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.scss
@@ -38,7 +38,7 @@
 }
 
 .data-box {
-	padding-top: 100rpx;
+	padding-top: 60rpx;
 
 	.item-box {
 		margin-bottom: 30rpx;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue b/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
index 4a9e7d1f..0ad0c700 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
@@ -1,7 +1,7 @@
 <template>
 	<coreshop-navbar :isBack="false" mode="left" title="购物车"> </coreshop-navbar>
 
-	<view class="content-box p-25 page-bg" :style="{ 'padding-top': `${statusBarHeight}px` }">
+	<view class="content-box p-25 page-bg">
 		<view class="cart-box" v-if="state.cartList.length > 0">
 			<view class="all-select" :style="{ 'top': `${statusBarHeight}px` }">
 				<view class="icon-box" @click="hanldeChangeAllSelect">
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
index 582f75d4..2391eb57 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
@@ -16,7 +16,7 @@
 				</template>
 			</uv-navbar>
 
-			<view class="content-box" :style="{ 'padding-top': `${statusBarHeight}px`, 'height': `${state.height}px` }">
+			<view class="content-box" :style="{'height': `${state.height}px` }">
 				<classifyOne v-if="shopConfigStore.config.cateStyle == GoodsListEnum.one" :data="state.categoriesList">
 				</classifyOne>
 				<classifyTwo v-else-if="shopConfigStore.config.cateStyle == GoodsListEnum.two"
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
index d14e26e2..001d2615 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom>
-		<view class=" goods-detail">
+		<view class=" goods-detail" :style="{ 'margin-top': `-${statusBarHeight}px` }">
 			<!-- 商品详情 -->
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
 				:swiperBanner="state.swiperBanner" :goodsDetailContent="state.goodsDetailContent"
@@ -38,6 +38,7 @@
 	import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
 	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
 	import { useLoginStore } from '@/core/store';
+	import { useSystemInfo } from '@/core/hooks';
 
 	interface QueryParams {
 		id : number;
@@ -49,6 +50,8 @@
 	/** 购物车store */
 	const _useCartStore = useCartStore();
 
+	const { statusBarHeight } = useSystemInfo();
+
 	const state = reactive<{
 		goodsDetailData : any;
 		swiperBanner : Array<string>;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue b/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
index 456d1d71..2665e721 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
@@ -10,7 +10,7 @@
 				</template>
 			</uv-navbar>
 
-			<view class="content-box p-25" :style="{ 'padding-top': `${statusBarHeight + 10}px` }">
+			<view class="content-box p-25">
 				<CustomPage ref="homePage" :coreshopData="state.coreshopData"></CustomPage>
 			</view>
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/member.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/member.scss
index 95388a5c..f387ff64 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/member.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/member.scss
@@ -2,14 +2,14 @@
 	position: relative;
 	.memeber-bg{
 		display: block;
-		width: 750rpx;
-		height: 600rpx;
+		width: 100%;
+		height: 400rpx;
 	}
 }
 
 .head-box {
 	position: absolute;
-	bottom: 13rpx;
+	bottom: 0;
 	left: 0;  
 	 width: 100%;
 	.user-info {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue
index d301cfc2..3be9d18f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue
@@ -1,6 +1,6 @@
 <template>
-	<coreshop-page :title="state.isScrollToTop ? '' : userInfoStore.userInfo?.nickName || ''" titleColor="#fff"
-		mode="left" :bgColor=" state.isScrollToTop ? 'rgba(0,0,0,0)':'#d33123'" :isShowStatusBarHeight="false"
+	<coreshop-page :title=" userInfoStore.userInfo?.nickName || ''" titleColor="#fff"
+		mode="left" bgColor="#d33123" :isShowStatusBarHeight="false"
 		:isBack="false" showLoginModalDom>
 		<view class="layout-member-page">
 			<view class="member-head">
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.scss b/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.scss
index 5c75d84f..27ad2404 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.scss
@@ -449,7 +449,7 @@
 		}
 
 		.btn {
-			width: 200rpx;
+			width: 240rpx;
 			text-align: center;
 			height: 90rpx;
 			line-height: 90rpx;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
index 264bdde1..3264cd4f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom>
-		<view class="goods-detail">
+		<view class="goods-detail" :style="{ 'margin-top': `-${statusBarHeight}px` }">
 			<!-- 商品详情 -->
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
 				:swiperBanner="state.swiperBanner" :spesDesc="state.spesDesc"
@@ -73,7 +73,7 @@
 	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
 	import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
 	import GoodsDetailBottomTabbar from '@/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue';
-	import { useLoadingFn } from '@/core/hooks';
+	import { useLoadingFn, useSystemInfo } from '@/core/hooks';
 	interface QueryParams {
 		id : number;
 	}
@@ -84,6 +84,8 @@
 	/** 购物车store */
 	const cartStore = useCartStore();
 
+	const { statusBarHeight } = useSystemInfo();
+
 	const state = reactive<{
 		goodsDetailData : any,
 		swiperBanner : Array<string>;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
index 3cbbb7de..295bcb20 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom>
-		<view class="goods-detail">
+		<view class="goods-detail" :style="{ 'margin-top': `-${statusBarHeight}px` }">
 			<!-- 商品详情 -->
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
 				:swiperBanner="state.swiperBanner" :shareType="ShareEnum.pinTuan"
@@ -83,7 +83,7 @@
 	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
 	import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
 	import GoodsDetailBottomTabbar from '@/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue';
-	import { useLoadingFn } from '@/core/hooks';
+	import { useLoadingFn,useSystemInfo } from '@/core/hooks';
 
 	interface QueryParams {
 		id : number;
@@ -95,6 +95,8 @@
 
 	/** 获取购物车数据 */
 	const cartStore = useCartStore();
+	
+	const { statusBarHeight } = useSystemInfo();
 
 	const state = reactive<{
 		id : number;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/list/list.scss b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/list/list.scss
index f0efeb32..6b75f164 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/list/list.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/list/list.scss
@@ -11,8 +11,7 @@
 	.content-box {
 		position: relative;
 		margin: 25rpx;
-		padding-top: 200rpx;
-
+		
 		.title-box {
 			display: flex;
 			align-items: center;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
index d1bc198f..9798721a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom>
-		<view class="goods-detail">
+		<view class="goods-detail" :style="{ 'margin-top': `-${statusBarHeight}px` }">
 			<!-- 商品详情 -->
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
 				:swiperBanner="state.swiperBanner" :spesDesc="state.spesDesc"
@@ -73,7 +73,7 @@
 	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
 	import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
 	import GoodsDetailBottomTabbar from '@/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue';
-	import { useLoadingFn } from '@/core/hooks';
+	import { useLoadingFn, useSystemInfo } from '@/core/hooks';
 
 	interface QueryParams {
 		id : number;
@@ -83,6 +83,8 @@
 	const _useLoginStore = useLoginStore();
 
 	const cartStore = useCartStore();
+	
+	const { statusBarHeight } = useSystemInfo();
 
 	const state = reactive<{
 		goodsDetailData : any,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/list/list.scss b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/list/list.scss
index 9863b7dc..1211f589 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/list/list.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/list/list.scss
@@ -1,3 +1,6 @@
+.layout-seckill-box{
+	 padding-top: 80rpx;
+}
 .navbar-box {
 	position: fixed;
 	left: 0;
@@ -31,8 +34,6 @@
 }
 
 .seckill-box {
-	padding-top: 100rpx;
-
 	.card-box {
 		margin-bottom: 35rpx;
 		margin: 25rpx;

From 6dcd665a41d2bb96495cdfa244ffa21d3e986b0c Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Wed, 23 Oct 2024 13:51:29 +0800
Subject: [PATCH 06/15] =?UTF-8?q?uniapp=E3=80=90=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=91=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5=E5=AF=BC?=
 =?UTF-8?q?=E8=A1=8C=E6=A0=8F=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coreshop-navbar/coreshop-navbar.vue       |  6 +-
 .../coreshop-page-content.vue                 | 20 +++---
 .../coreshop-page/coreshop-page.vue           |  8 ++-
 .../CoreShop/pages/category/category.vue      |  4 +-
 .../classify-five/classify-five.scss          |  1 -
 .../classify-five/classify-five.vue           |  5 +-
 .../classify-four/classify-four.scss          |  9 ++-
 .../classify-four/classify-four.vue           | 69 +++++++++----------
 .../CoreShop/pages/classify/classify.scss     |  1 +
 .../CoreShop/pages/classify/classify.vue      |  8 +--
 .../components/home-search/home-search.vue    |  2 +-
 .../CoreShop/pages/goods/detail.vue           | 13 ++--
 .../CoreShop/pages/home/home.vue              |  2 +-
 .../CoreShop/pages/member/member.scss         | 18 ++---
 .../CoreShop/pages/member/member.vue          |  2 +-
 .../activity/groupBuying/detail/detail.vue    |  4 +-
 .../activity/pinTuan/detail/detail.vue        | 28 ++++----
 .../activity/seckill/detail/detail.vue        |  6 +-
 .../activity/seckill/list/list.scss           |  2 +-
 .../member/collection/collection.scss         |  1 -
 .../member/footprint/footprint.scss           |  3 +-
 .../subpackage/serviceGoods/detail/detail.vue |  2 +-
 .../pages/subpackage/storeMap/storeMap.vue    |  2 +-
 23 files changed, 109 insertions(+), 107 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
index 7b124362..97ed81a6 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
@@ -1,5 +1,5 @@
 <template>
-	<uv-navbar :bgColor="props.bgColor" placeholder :height="menuButtonHeight+'px'">
+	<uv-navbar :bgColor="props.bgColor" :height="menuButtonHeight+'px'" :placeholder="props.placeholder">
 		<template #left>
 			<view class="page-back">
 				<image v-if="props.isBack" @click="hanlderBack" class="back"
@@ -26,13 +26,15 @@
 		mode : string,
 		title : string,
 		handleCustomRouteJump : () => void | null,
+		placeholder:boolean;
 	}>(), {
 		isBack: true,
-		bgColor: '#EEF3F7',
+		bgColor: '#eef2f6',
 		titleColor: '#000',
 		mode: 'center',
 		title: '',
 		handleCustomRouteJump: null,
+		placeholder:true,
 	});
 
 	const hanlderBack = () => {
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue
index ba7318ed..fe47bd78 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue
@@ -1,23 +1,21 @@
 <template>
 	<view class="layout-page-box page-bg" :style="props.customStyle">
-		<coreshop-navbar :isBack="props.isBack" :bgColor="props.bgColor" :mode="props.mode" :title="props.title"
-			:titleColor="props.titleColor" :handleCustomRouteJump="props.handleCustomRouteJump"></coreshop-navbar>
-		<view class="layout-page-content"
-			:style="{ ...props.contentStyle }">
+		<coreshop-navbar :isBack="props.isBack" :bgColor="props.bgColor" :placeholder="props.placeholder"
+			:mode="props.mode" :title="props.title" :titleColor="props.titleColor"
+			:handleCustomRouteJump="props.handleCustomRouteJump"></coreshop-navbar>
+		<view class="layout-page-content" :style="{ ...props.contentStyle }">
 			<slot></slot>
 		</view>
 		<template v-if="props.showLoginModalDom">
 			<coreshop-login-modal :show="_useLoginStore.showLoginModalTogglePop"
-				@handleChangePopup="handleChangeLoginPopup" @getUserInfo="_useLoginStore.getUserInfo()"></coreshop-login-modal>
+				@handleChangePopup="handleChangeLoginPopup"
+				@getUserInfo="_useLoginStore.getUserInfo()"></coreshop-login-modal>
 		</template>
 	</view>
 </template>
 <script setup lang="ts">
-	import { useSystemInfo } from '@/core/hooks';
 	import { useLoginStore } from '@/core/store';
 
-	// 获取自定义导航栏高度
-	const { statusBarHeight } = useSystemInfo();
 	const _useLoginStore = useLoginStore();
 
 	const props = withDefaults(defineProps<{
@@ -31,9 +29,10 @@
 		contentStyle : any;
 		handleCustomRouteJump : () => void | null,
 		showLoginModalDom : boolean;
+		placeholder : boolean;
 	}>(), {
 		isBack: true,
-		bgColor: '#EEF3F7',
+		bgColor: '#eef2f6',
 		titleColor: '#000',
 		mode: 'center',
 		title: '',
@@ -41,7 +40,8 @@
 		customStyle: {},
 		contentStyle: {},
 		handleCustomRouteJump: null,
-		showLoginModalDom: false
+		showLoginModalDom: false,
+		placeholder: true,
 	});
 
 	/** 打开获取关闭login弹框 */
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
index a02cd385..1c7db9cc 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
@@ -26,11 +26,12 @@
 		handleCustomRouteJump : () => void | null,
 		showLoginModalDom : boolean;
 		needSkeleton : boolean;
-		skeleton ?: Array<object>;
+		skeleton ?: Array<any>;
 		skeletonLoading : boolean;
+		placeholder : boolean;
 	}>(), {
 		isBack: true,
-		bgColor: '#D33123',
+		bgColor: '#eef2f6',
 		titleColor: '#000',
 		mode: 'center',
 		title: '',
@@ -46,7 +47,8 @@
 			gap: '20rpx',
 			style: ['width: 200rpx;marginBottom: 50rpx;', 'height: 100rpx;', 'width: 500rpx;'],
 		}],
-		skeletonLoading: false
+		skeletonLoading: false,
+		placeholder: true,
 	});
 </script>
 <style lang="scss" scoped>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/category.vue b/CoreCms.Net.Uni-App/CoreShop/pages/category/category.vue
index 7f4cc901..bebf4b23 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/category/category.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/category.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="layout-classify-page">
-		<uv-navbar bgColor="#fff">
+		<uv-navbar bgColor="#fff" :height="`${menuButtonHeight}px`">
 			<template #left>
 				<view class="search-box">
 					<image @click="hanlderBack" class="back" :src="handleStaticResources('/static/images/back.png')">
@@ -143,7 +143,7 @@
 	}
 
 	// 获取自定义导航栏高度
-	const { statusBarHeight } = useSystemInfo();
+	const { statusBarHeight ,menuButtonHeight} = useSystemInfo();
 
 	const state = reactive<{
 		searchKey : string;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.scss b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.scss
index f4df4379..53e007cd 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.scss
@@ -1,7 +1,6 @@
 .layout-classify {
 	position: relative;
 }
-
 .big-classify {
 	display: flex;
 	align-items: center;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue
index 9456ba2f..052c1bbc 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue
@@ -225,10 +225,9 @@
 		})
 
 		nextTick(async () => {
-			state.bigClassifyH = ((await getDomInfo('.big-classify', instance.proxy)) as { height : number }).height;
-
+			state.bigClassifyH = ((await getDomInfo('.big-classify', instance.proxy)) as { height : number }).height; 
 			setTimeout(async () => {
-				state.rightTabH = ((await getDomInfo('.right-tab-box', instance.proxy)) as { height : number }).height;
+				state.rightTabH = ((await getDomInfo('.right-tab-box', instance.proxy)) as { height : number }).height; 
 			}, 100)
 		})
 	})
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.scss b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.scss
index 5a78a449..c10ef144 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.scss
@@ -1,7 +1,7 @@
 .classify-box {
 	max-width: 750rpx;
 	position: relative;
-	display: flex; 
+	display: flex;
 	justify-content: space-between;
 
 	.classify-left {
@@ -60,8 +60,13 @@
 			width: 550rpx;
 			padding: 20rpx 0;
 		}
-
+		.right-data-list{
+			position: relative;
+			flex: 1;
+		}
 		.scroll-view {
+			position: absolute;
+			height: 100%;
 			padding: 0 20rpx 0;
 			width: calc(100% - 40rpx);
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue
index f4b92642..97402f09 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue
@@ -13,43 +13,43 @@
 			<view class="right-tab-box">
 				<coreshop-tabs :list="state.rightTabList" @hanldeClickTab="hanldeChangeRightTab"></coreshop-tabs>
 			</view>
-			<scroll-view class="scroll-view" :style="{ 'height': `${props.height - 50}px` }" :scroll-y="true"
-				@scrolltolower="handleScrolltolower">
-				<view class="advert-box radius-15">
-					<coreshop-advert :code="advertPosition.goodsClassifyBanner"></coreshop-advert>
-				</view>
-				<view class="data-box" v-if="state.goodsList.length > 0">
-					<view class="item-box" v-for="item in state.goodsList" :key="item.id">
-						<coreshop-goods-card imgWidth="150rpx" imgHeight="150rpx"
-							:goodsData="hanldeCombinationGoodsData(item)" @hanldeClickGoods="hanldeClickGoods">
-							<template #goodPrice>
-								<view class="price-msg">
-									<view class="price-box">
-										<view class="price">
-											<text class="symbol">￥</text>
-											<text class="num">{{ item.price }}</text>
+			<view class="right-data-list">
+				<scroll-view class="scroll-view" :scroll-y="true" @scrolltolower="handleScrolltolower">
+					<view class="advert-box radius-15">
+						<coreshop-advert :code="advertPosition.goodsClassifyBanner"></coreshop-advert>
+					</view>
+					<view class="data-box" v-if="state.goodsList.length > 0">
+						<view class="item-box" v-for="item in state.goodsList" :key="item.id">
+							<coreshop-goods-card imgWidth="150rpx" imgHeight="150rpx"
+								:goodsData="hanldeCombinationGoodsData(item)" @hanldeClickGoods="hanldeClickGoods">
+								<template #goodPrice>
+									<view class="price-msg">
+										<view class="price-box">
+											<view class="price">
+												<text class="symbol">￥</text>
+												<text class="num">{{ item.price }}</text>
+											</view>
+											<view class="underlin-price">￥{{ item.mktprice }}</view>
+										</view>
+										<view class="btn" @click="handleSelectSku(item.id)">
+											<image class="img" :src="handleStaticResources('/static/images/cart.png')">
+											</image>
 										</view>
-										<view class="underlin-price">￥{{ item.mktprice }}</view>
 									</view>
-									<view class="btn" @click="handleSelectSku(item.id)">
-										<image class="img" :src="handleStaticResources('/static/images/cart.png')">
-										</image>
-									</view>
-								</view>
-							</template>
-						</coreshop-goods-card>
+								</template>
+							</coreshop-goods-card>
+						</view>
+						<view class="no-more">
+							<uv-divider :dashed="true"
+								:text="state.totalPages > state.page ? '下滑加载更多' : '没有更多了'"></uv-divider>
+						</view>
 					</view>
-					<view class="no-more">
-						<uv-divider :dashed="true"
-							:text="state.totalPages > state.page ? '下滑加载更多' : '没有更多了'"></uv-divider>
+					<view v-else>
+						<coreshop-empty></coreshop-empty>
 					</view>
-				</view>
-				<view v-else>
-					<coreshop-empty></coreshop-empty>
-				</view>
-			</scroll-view>
+				</scroll-view>
+			</view>
 		</view>
-
 		<view class="shopping-box">
 			<view class="shopping-Bag">
 				<view class="bag-box">
@@ -75,8 +75,7 @@
 </template>
 
 <script setup lang="ts">
-	import { reactive, ref, watch } from 'vue';
-	import { onShow } from '@dcloudio/uni-app';
+	import { onMounted, reactive, ref, watch, nextTick } from 'vue';
 	import { UserToken, advertPosition, onClassifyPageHide } from '@/core/consts';
 	import { queryGoodsPageList, queryCartNumAndMoney, queryGoodsDetailByToken, queryGoodsDetail, queryAddCart } from '@/core/api';
 	import type { CategoriesType, Response, GoodsListType, GoodsType } from '@/core/models';
@@ -147,7 +146,7 @@
 		}
 	})
 
-	onShow(() => {
+	onMounted(() => {
 		if (uni.getStorageSync(UserToken)) {
 			getCartNumAndMoney();
 		}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.scss b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.scss
index 48b25485..f477b891 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.scss
@@ -4,6 +4,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
+		max-width: 500rpx;
 		.page-name {
 			font-size: 32rpx;
 			margin-right: 20rpx;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
index 2391eb57..0cdc7e65 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
@@ -1,7 +1,7 @@
 <template>
 	<coreshop-page :isBack="false" bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom>
 		<view class="layout-classify-page">
-			<uv-navbar bgColor="#EEF3F7">
+			<uv-navbar bgColor="#EEF3F7" :height="menuButtonHeight+'px'">
 				<template #left>
 					<view class="search-box">
 						<view class="page-name">分类</view>
@@ -55,7 +55,7 @@
 	const shopConfigStore : ShopConfigStoreType = useShopConfigStore();
 
 	// 获取自定义导航栏高度
-	const { statusBarHeight, systemInfo } = useSystemInfo();
+	const { statusBarHeight, systemInfo, menuButtonHeight } = useSystemInfo();
 
 	const state = reactive<{
 		categoriesList : Array<CategoriesType>,
@@ -70,8 +70,8 @@
 	onMounted(async () => {
 		getAllCategories();
 		nextTick(() => {
-			// 屏幕总高度 - 顶部tab栏高度 - 顶部安全高度 - 底部安全高度 -  底部tabBar的默认高度50（如果修改了配置高度这里也要同步修改）
-			state.height = systemInfo.value.screenHeight - systemInfo.value.statusBarHeight - (systemInfo.value.system?.includes('iOS') ? 44 : 48) - systemInfo.value.safeAreaInsets?.bottom - 50;
+			// 屏幕总高度 - 顶部高度 - 底部安全高度 -  底部tabBar的默认高度50（如果修改了配置高度这里也要同步修改） 
+			state.height = systemInfo.value.screenHeight - statusBarHeight.value - systemInfo.value.safeAreaInsets?.bottom - 50;
 		})
 	})
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-search/home-search.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-search/home-search.vue
index 953d0e4a..417b6e9e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-search/home-search.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-search/home-search.vue
@@ -8,7 +8,7 @@
 </template>
 <script setup lang="ts">
 	import { ref } from 'vue';
-	import { handleShowToast, handleRouteNavigateTo } from '@/core/utils';
+	import { handleRouteNavigateTo } from '@/core/utils';
 
 	const props = withDefaults(defineProps<{
 		data : any,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
index 7fce3e5f..bd79d56f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
@@ -1,6 +1,6 @@
 <template>
-	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom>
-		<view class=" goods-detail" :style="{ 'margin-top': `-${statusBarHeight}px` }">
+	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom>
+		<view class="goods-detail">
 			<!-- 商品详情 -->
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
 				:swiperBanner="state.swiperBanner" :goodsDetailContent="state.goodsDetailContent"
@@ -38,7 +38,6 @@
 	import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
 	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
 	import { useLoginStore } from '@/core/store';
-	import { useSystemInfo } from '@/core/hooks';
 
 	interface QueryParams {
 		id : number;
@@ -50,8 +49,6 @@
 	/** 购物车store */
 	const _useCartStore = useCartStore();
 
-	const { statusBarHeight } = useSystemInfo();
-
 	const state = reactive<{
 		goodsDetailData : any;
 		swiperBanner : Array<string>;
@@ -124,15 +121,15 @@
 			});
 		}
 
-		/** 获取分享url */ 
+		/** 获取分享url */
 		state.shareUrl = await getShareUrl({
 			client: ShareClientEnum.wxMiNiProgram,
 			url: shareUrl,
 			type: ShareModelEnum.url,
 			page: ShareEnum.goods,
 			params: { goodsId: goodsDetail.data.id, }
-		}) 
-		
+		})
+
 		/** 如果用户登录，获取购物车数量 */
 		if (uni.getStorageSync(UserToken)) {
 			getCartNum();
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue b/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
index 6696540d..a293129f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
@@ -1,5 +1,5 @@
 <template>
-	<coreshop-page :isBack="false" bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom>
+	<coreshop-page :isBack="false" bgColor="rgba(0,0,0,0)"  :isShowStatusBarHeight="false" showLoginModalDom>
 		<view class="layout-home-page page-bg">
 			<image class="home-bg" :src="handleStaticResources('/static/images/home-bg.jpg')"></image>
 			<uv-navbar :title="shopConfigStore.config?.shopName"
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/member.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/member.scss
index f387ff64..10b6309c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/member.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/member.scss
@@ -1,17 +1,17 @@
-.member-head{
+.member-head {
 	position: relative;
-	.memeber-bg{
+	.memeber-bg {
 		display: block;
 		width: 100%;
-		height: 400rpx;
+		height: 600rpx;
 	}
 }
 
 .head-box {
 	position: absolute;
-	bottom: 0;
-	left: 0;  
-	 width: 100%;
+	bottom: 12rpx;
+	left: 0;
+	width: 100%;
 	.user-info {
 		display: flex;
 		align-items: center;
@@ -82,9 +82,9 @@
 			}
 		}
 	}
-	.member-box {  
-		.member-content { 
-			width: 88%; 
+	.member-box {
+		.member-content {
+			width: 88%;
 			margin: auto;
 			display: flex;
 			align-items: center;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue
index 88b733c1..786b8356 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue
@@ -1,5 +1,5 @@
 <template>
-	<coreshop-page :title=" userInfoStore.userInfo?.nickName || ''" titleColor="#fff"
+	<coreshop-page :title="state.isScrollToTop ? '' :userInfoStore.userInfo?.nickName" :placeholder="false" titleColor="#fff"
 		mode="left" bgColor="#d33123" :isShowStatusBarHeight="false"
 		:isBack="false" showLoginModalDom>
 		<view class="layout-member-page">
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
index 41001792..bd93b473 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
@@ -1,6 +1,6 @@
 <template>
-	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom>
-		<view class="goods-detail" :style="{ 'margin-top': `-${statusBarHeight}px` }">
+	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom>
+		<view class="goods-detail">
 			<!-- 商品详情 -->
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
 				:swiperBanner="state.swiperBanner" :spesDesc="state.spesDesc"
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
index 2a678f91..3cd8d5ad 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
@@ -1,6 +1,6 @@
 <template>
-	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom>
-		<view class="goods-detail" :style="{ 'margin-top': `-${statusBarHeight}px` }">
+	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom>
+		<view class="goods-detail">
 			<!-- 商品详情 -->
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
 				:swiperBanner="state.swiperBanner" :shareType="ShareEnum.pinTuan"
@@ -62,28 +62,28 @@
 
 			<!-- 商品sku弹框 -->
 			<GoodsDetailSkuPopup :showSku="state.showSku" :goodsDetailData="state.goodsDetailData"
-				:isShowAddCartBtn="false" :buyNowNowloading="loading" @handleChangePopup="handleChangePopup" @handleBuyNow="handleBuyNow"
-				:btnBuyTitlt="state.btnBuyTitlt">
+				:isShowAddCartBtn="false" :buyNowNowloading="loading" @handleChangePopup="handleChangePopup"
+				@handleBuyNow="handleBuyNow" :btnBuyTitlt="state.btnBuyTitlt">
 			</GoodsDetailSkuPopup>
 		</view>
 	</coreshop-page>
 </template>
 <script setup lang="ts">
 	import { reactive, ref } from 'vue';
-	import { onLoad ,onShareAppMessage,onShareTimeline} from '@dcloudio/uni-app';
+	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
 	import { queryPinTuanGoodsDetail, queryCartNum, queryAddCart, queryOrderPinTuanTeamInfo } from '@/core/api';
 	import type { Response } from '@/core/models';
-	import { UserToken,shareUrl } from '@/core/consts'
+	import { UserToken, shareUrl } from '@/core/consts'
 	import { useCartStore, useLoginStore } from '@/core/store';
-	import { PaymentTypeEnum, ShareEnum,ShareClientEnum,ShareModelEnum } from '@/core/enum';
-	import { handleRouteNavigateTo, handleShowToast ,getShareUrl} from '@/core/utils';
+	import { PaymentTypeEnum, ShareEnum, ShareClientEnum, ShareModelEnum } from '@/core/enum';
+	import { handleRouteNavigateTo, handleShowToast, getShareUrl } from '@/core/utils';
 	import { deepClone } from '@/uni_modules/uv-ui-tools/libs/function/index.js';
 
 	import GoodsDetail from '@/pages/components/goods-detail/index.vue';
 	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
 	import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
 	import GoodsDetailBottomTabbar from '@/pages/components/goods-detail/components/goods-detail-bottom-tabbar/goods-detail-bottom-tabbar.vue';
-	import { useLoadingFn,useSystemInfo } from '@/core/hooks';
+	import { useLoadingFn, useSystemInfo } from '@/core/hooks';
 
 	interface QueryParams {
 		id : number;
@@ -95,7 +95,7 @@
 
 	/** 获取购物车数据 */
 	const cartStore = useCartStore();
-	
+
 	const { statusBarHeight } = useSystemInfo();
 
 	const state = reactive<{
@@ -111,7 +111,7 @@
 		isSingleBuy : boolean;
 		btnBuyTitlt : string;
 		teamInfo : any;
-		shareUrl:string;
+		shareUrl : string;
 	}>({
 		id: 0,
 		goodsDetailData: {},
@@ -125,7 +125,7 @@
 		isSingleBuy: true,
 		btnBuyTitlt: "发起拼团",
 		teamInfo: {},
-		shareUrl:"",
+		shareUrl: "",
 	});
 
 	const loading = ref(false);
@@ -177,7 +177,7 @@
 		if (uni.getStorageSync(UserToken)) {
 			getCartNum();
 		}
-		
+
 		state.shareUrl = await getShareUrl({
 			client: ShareClientEnum.wxMiNiProgram,
 			url: shareUrl,
@@ -283,7 +283,7 @@
 			handleShowToast(addCart.msg);
 		}
 	}
-	
+
 	/** 分享 */
 	onShareAppMessage(() => {
 		return {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
index dd17422f..d5803c84 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
@@ -1,6 +1,6 @@
 <template>
-	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom>
-		<view class="goods-detail" :style="{ 'margin-top': `-${statusBarHeight}px` }">
+	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom>
+		<view class="goods-detail">
 			<!-- 商品详情 -->
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
 				:swiperBanner="state.swiperBanner" :spesDesc="state.spesDesc"
@@ -83,7 +83,7 @@
 	const _useLoginStore = useLoginStore();
 
 	const cartStore = useCartStore();
-	
+
 	const { statusBarHeight } = useSystemInfo();
 
 	const state = reactive<{
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/list/list.scss b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/list/list.scss
index 1211f589..e13c8da3 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/list/list.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/list/list.scss
@@ -9,7 +9,7 @@
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
-
+	z-index: 99;
 	.item {
 		position: relative;
 		width: 33.33%;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/collection/collection.scss b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/collection/collection.scss
index b01f8082..1d59212d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/collection/collection.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/collection/collection.scss
@@ -11,7 +11,6 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		z-index: 99;
 		.collection {
 			display: flex;
 			align-items: center;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/footprint/footprint.scss b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/footprint/footprint.scss
index 1ce2c66f..0aaa6de4 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/footprint/footprint.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/footprint/footprint.scss
@@ -10,8 +10,7 @@
 		bottom: 0;
 		display: flex;
 		align-items: center;
-		justify-content: space-between;
-		z-index: 99;
+		justify-content: space-between; 
 		.collection,
 		.delete {
 			display: flex;
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/serviceGoods/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/serviceGoods/detail/detail.vue
index e67dea0f..20b8c0fb 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/serviceGoods/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/serviceGoods/detail/detail.vue
@@ -1,5 +1,5 @@
 <template>
-	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom>
+	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom>
 		<view class="layout-goods-detail">
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
 				:swiperBanner="state.swiperBanner" :goodsDetailContent="state.goodsDetailContent"
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/storeMap/storeMap.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/storeMap/storeMap.vue
index 41dd7b09..c199a2f0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/storeMap/storeMap.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/storeMap/storeMap.vue
@@ -1,5 +1,5 @@
 <template>
-	<coreshop-page title="门店列表" mode="left" bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false">
+	<coreshop-page title="门店列表" mode="left" bgColor="rgba(0,0,0,0)" :placeholder="false" :isShowStatusBarHeight="false">
 		<view class="layout-store-box">
 			<view class="map-box">
 				<map style="width: 100%;height: 100%;" id="map" :scale="11" :enable-3D="true" :show-compass="true"

From 1edaa65fadafb1c7dd9d3ee4bf6f0bbce691c86e Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Wed, 23 Oct 2024 14:16:18 +0800
Subject: [PATCH 07/15] =?UTF-8?q?uniapp=E3=80=90=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=91=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=9C=B0=E5=9D=80=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=AA=8C=E8=AF=81=E6=89=8B=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/pages/subpackage/member/address/index/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/address/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/address/index/index.vue
index 770dedc4..ff7d97df 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/address/index/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/address/index/index.vue
@@ -64,7 +64,8 @@
 	import { useShopConfigStore } from '@/core/store';
 	import { handleShowToast } from '@/core/utils';
 	import { useLoadingFn } from '@/core/hooks';
-
+	import { mobile } from '@/uni_modules/uv-ui-tools/libs/function/test.js';
+	
 	interface QueryParams {
 		type : string;
 		id : string | number;
@@ -294,7 +295,7 @@
 		if (!state.form.mobile) {
 			handleShowToast('请输入收货人手机号'); return;
 		}
-		if (state.form.mobile.length !== 11) {
+		if (!mobile(state.form.mobile)) {
 			handleShowToast('收货人手机号格式不正确'); return;
 		}
 		if (state.form.areaId <= 0) {

From d16393b1f543d240fdd9fff6d5b61a29ce705f82 Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Wed, 23 Oct 2024 21:01:07 +0800
Subject: [PATCH 08/15] =?UTF-8?q?uniapp=E3=80=90=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E3=80=91=EF=BC=9A=E6=94=AF=E4=BB=98=E5=AE=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coreshop-login-modal/coreshop-login-modal.vue   |  2 +-
 .../components/coreshop-navbar/coreshop-navbar.vue  |  2 ++
 CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue    |  3 ++-
 .../CoreShop/pages/classify/classify.vue            | 13 +++++++------
 CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue    | 11 +++++------
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
index f4e5e294..c3dba324 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue
@@ -97,7 +97,7 @@
 			// #endif
 
 			// #ifdef MP-ALIPAY
-			const login : Response<any> = await queryAliPayAppAuthTokenBYCode({ code, });
+			const login : Response<any> = await queryAliPayAppAuthTokenBYCode({id:code});
 			// #endif 
 
 			if (login.status) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
index 97ed81a6..564f83c7 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue
@@ -1,5 +1,6 @@
 <template>
 	<uv-navbar :bgColor="props.bgColor" :height="menuButtonHeight+'px'" :placeholder="props.placeholder">
+		<!-- #ifndef MP-ALIPAY -->
 		<template #left>
 			<view class="page-back">
 				<image v-if="props.isBack" @click="hanlderBack" class="back"
@@ -8,6 +9,7 @@
 					:style="{ 'color': props.titleColor }">{{ props.title }}</text>
 			</view>
 		</template>
+		<!-- #endif -->
 		<template v-if="props.mode === 'center'" #center>
 			<view class="title" :style="{ 'color': props.titleColor }">{{ props.title }}</view>
 		</template>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue b/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
index 0ad0c700..1e1ece03 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
@@ -1,6 +1,7 @@
 <template>
+	<!-- #ifndef MP-ALIPAY -->
 	<coreshop-navbar :isBack="false" mode="left" title="购物车"> </coreshop-navbar>
-
+	<!-- #endif -->
 	<view class="content-box p-25 page-bg">
 		<view class="cart-box" v-if="state.cartList.length > 0">
 			<view class="all-select" :style="{ 'top': `${statusBarHeight}px` }">
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
index 0cdc7e65..1f83f77f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
@@ -1,6 +1,7 @@
 <template>
 	<coreshop-page :isBack="false" bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom>
 		<view class="layout-classify-page">
+			<!-- #ifndef MP-ALIPAY -->
 			<uv-navbar bgColor="#EEF3F7" :height="menuButtonHeight+'px'">
 				<template #left>
 					<view class="search-box">
@@ -15,7 +16,7 @@
 					</view>
 				</template>
 			</uv-navbar>
-
+			<!-- #endif -->
 			<view class="content-box" :style="{'height': `${state.height}px` }">
 				<classifyOne v-if="shopConfigStore.config.cateStyle == GoodsListEnum.one" :data="state.categoriesList">
 				</classifyOne>
@@ -36,7 +37,7 @@
 </template>
 
 <script setup lang="ts">
-	import { onMounted, reactive, nextTick } from 'vue';
+	import { onMounted, reactive, nextTick, watchEffect } from 'vue';
 	import { onHide } from '@dcloudio/uni-app';
 	import { useShopConfigStore } from '@/core/store';
 	import { queryAllCategories } from '@/core/api';
@@ -69,10 +70,10 @@
 
 	onMounted(async () => {
 		getAllCategories();
-		nextTick(() => {
-			// 屏幕总高度 - 顶部高度 - 底部安全高度 -  底部tabBar的默认高度50（如果修改了配置高度这里也要同步修改） 
-			state.height = systemInfo.value.screenHeight - statusBarHeight.value - systemInfo.value.safeAreaInsets?.bottom - 50;
-		})
+	})
+
+	watchEffect(() => {
+		state.height = systemInfo.value.screenHeight - statusBarHeight.value - systemInfo.value.safeAreaInsets?.bottom - 50;
 	})
 
 	onHide(() => {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue b/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
index a293129f..ade13087 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
@@ -5,13 +5,15 @@
 			<uv-navbar :title="shopConfigStore.config?.shopName"
 				:bg-color="state.isScrollTop ? handleStaticResources('/static/images/home-bg.jpg') : 'rgba(0,0,0,0)'"
 				imgMode="aspectFill" :titleStyle="{'color':'#fff','font-size':'32rpx'}">
+				<!-- #ifndef MP-ALIPAY -->
 				<template #left>
 					<uv-icon name="search" size="22" color="#fff" @click="handleSearch"></uv-icon>
 				</template>
+				<!-- #endif -->
 			</uv-navbar>
 
 			<view class="content-box p-25">
-				<CustomPage ref="homePage" :coreshopData="state.coreshopData"></CustomPage>
+				<CustomPage :coreshopData="state.coreshopData"></CustomPage>
 			</view>
 
 			<!-- 备案信息 -->
@@ -31,16 +33,13 @@
 	import CustomPage from '@/pages/components/custom-page/index.vue';
 	import HomeAdpop from '@/pages/components/custom-page/components/home-adpop/home-adpop.vue';
 	import { handleStaticResources, handleRouteNavigateTo, getShareUrl, getDefaultShareData } from '@/core/utils';
-	import { useSystemInfo, useLoadingFn } from '@/core/hooks';
+	import { useLoadingFn } from '@/core/hooks';
 	import { UserToken, onHomePageShow, shareUrl } from '@/core/consts';
 	import { useUserInfoStore, useShopConfigStore } from '@/core/store';
 	import { ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
 
 	/** 获取项目配置 */
-	const shopConfigStore = useShopConfigStore();
-
-	/** 获取自定义导航栏高度 */
-	const { statusBarHeight } = useSystemInfo();
+	const shopConfigStore = useShopConfigStore(); 
 
 	/** 获取 用户数据 */
 	const userInfoStore = useUserInfoStore();

From 414c9514a45ae0b1036a5e6fde4a5407b09766bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?21=E4=B8=96=E7=BA=AA=E5=B0=8F=E5=85=AB=E8=B7=AF?=
 <2529156631@qq.com>
Date: Thu, 24 Oct 2024 00:11:28 +0800
Subject: [PATCH 09/15] =?UTF-8?q?uniapp=E3=80=90=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E3=80=91:=20=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CoreCms.Net.Uni-App/CoreShop/App.vue          | 19 +++++----
 .../coreshop-page/coreshop-page.vue           | 14 +++++++
 .../CoreShop/core/store/config.ts             |  8 +++-
 .../CoreShop/pages-config/main-page.json      | 10 ++---
 .../pages-config/subpackage-activity.json     |  8 ++--
 CoreCms.Net.Uni-App/CoreShop/pages.json       | 18 ++++-----
 .../CoreShop/pages/cart/cart.vue              | 37 ++++++++++++-----
 .../CoreShop/pages/category/category.vue      | 40 ++++++++++++-------
 .../classify-five/classify-five.vue           |  5 +--
 .../classify-four/classify-four.vue           |  5 +--
 .../CoreShop/pages/classify/classify.vue      | 22 +++++++---
 .../CoreShop/pages/goods/detail.vue           | 32 +++++++++++----
 .../CoreShop/pages/home/home.vue              | 20 +++++++---
 .../activity/groupBuying/detail/detail.vue    | 20 +++++++---
 .../activity/pinTuan/detail/detail.vue        | 20 +++++++---
 .../activity/seckill/detail/detail.vue        | 22 ++++++----
 .../activity/solitaire/detail/detail.vue      | 22 +++++++---
 17 files changed, 214 insertions(+), 108 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/App.vue b/CoreCms.Net.Uni-App/CoreShop/App.vue
index 9ac19309..2b6dd6b9 100644
--- a/CoreCms.Net.Uni-App/CoreShop/App.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/App.vue
@@ -3,15 +3,18 @@
 	import { queryShopConfigV2, queryAppVersions } from '@/core/api';
 	import type { Response, ShopConfigType } from '@/core/models';
 	import { useShopConfigStore } from '@/core/store';
-	
+
+	/** 获取项目配置 */
+	const shopConfigStore = useShopConfigStore();
+
 	onShow(() => {
 		console.log('App Show')
 	})
-	
+
 	onHide(() => {
 		console.log('App Hide')
 	})
-	
+
 	onLaunch(() => {
 		getShopConfigV2();
 		/** 版本设置 */
@@ -31,15 +34,11 @@
 		checkVersion()
 		// #endif
 	})
-	
-	/** 获取项目配置 */
-	const shopConfigStore = useShopConfigStore();
-	
+
 	const getShopConfigV2 = async () => {
-		const shopConfig : Response<ShopConfigType> = await queryShopConfigV2();
-		shopConfigStore.setConfig(shopConfig.data);
+		shopConfigStore.querySystemConfig();
 	}
-	
+
 	const autoUpdate = () => {
 		/** 获取小程序更新机制兼容 */
 		if (wx.canIUse('getUpdateManager')) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
index 1c7db9cc..3731b59d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-page.vue
@@ -11,6 +11,10 @@
 		<coreshop-page-content v-bind="props">
 			<slot name="default" />
 		</coreshop-page-content>
+		<template v-if="props.needLoadingPage">
+			<uv-loading-page :loading="props.loadingPage" :loading-text="props.loadingText"
+				:font-size="props.loadingTextFontSize" :bgColor="props.loadingBgColor"></uv-loading-page>
+		</template>
 	</template>
 </template>
 <script setup lang="ts">
@@ -29,6 +33,11 @@
 		skeleton ?: Array<any>;
 		skeletonLoading : boolean;
 		placeholder : boolean;
+		loadingPage : boolean;
+		needLoadingPage : boolean;
+		loadingText : string;
+		loadingTextFontSize : string;
+		loadingBgColor : string;
 	}>(), {
 		isBack: true,
 		bgColor: '#eef2f6',
@@ -49,6 +58,11 @@
 		}],
 		skeletonLoading: false,
 		placeholder: true,
+		loadingPage: false,
+		needLoadingPage: false,
+		loadingText: '加载中...',
+		loadingTextFontSize: '24rpx',
+		loadingBgColor: 'rgba(255, 255, 255, 0.2)'
 	});
 </script>
 <style lang="scss" scoped>
diff --git a/CoreCms.Net.Uni-App/CoreShop/core/store/config.ts b/CoreCms.Net.Uni-App/CoreShop/core/store/config.ts
index 6e585d90..babdf54c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/core/store/config.ts
+++ b/CoreCms.Net.Uni-App/CoreShop/core/store/config.ts
@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
-import type { ShopConfigStoreType, ShopConfigType } from '@/core/models';
-
+import type { ShopConfigStoreType, ShopConfigType,Response } from '@/core/models';
+import { queryShopConfigV2 } from '@/core/api';
 export const useShopConfigStore = defineStore('shopConfig', {
 	state: () : ShopConfigStoreType => {
 		return {
@@ -11,6 +11,10 @@ export const useShopConfigStore = defineStore('shopConfig', {
 		getConfig: state => state.config,
 	},
 	actions: {
+		async querySystemConfig() {
+			const shopConfig : Response<ShopConfigType> = await queryShopConfigV2();
+			this.setConfig(shopConfig.data);
+		},
 		setConfig(data : ShopConfigType) {
 			this.config = data;
 		},
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages-config/main-page.json b/CoreCms.Net.Uni-App/CoreShop/pages-config/main-page.json
index 5934c318..71576185 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages-config/main-page.json
+++ b/CoreCms.Net.Uni-App/CoreShop/pages-config/main-page.json
@@ -3,7 +3,7 @@
 			"path": "pages/home/home",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
@@ -11,7 +11,7 @@
 			"path": "pages/cart/cart",
 			"style": {
 				"navigationBarTitleText": "购物车",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
@@ -19,7 +19,7 @@
 			"path": "pages/classify/classify",
 			"style": {
 				"navigationBarTitleText": "分类",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
@@ -35,7 +35,7 @@
 			"path": "pages/category/category",
 			"style": {
 				"navigationBarTitleText": "商品列表",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
@@ -43,7 +43,7 @@
 			"path": "pages/goods/detail",
 			"style": {
 				"navigationBarTitleText": "商品详情",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages-config/subpackage-activity.json b/CoreCms.Net.Uni-App/CoreShop/pages-config/subpackage-activity.json
index 42a3b005..982ff49d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages-config/subpackage-activity.json
+++ b/CoreCms.Net.Uni-App/CoreShop/pages-config/subpackage-activity.json
@@ -13,7 +13,7 @@
 				"path": "pinTuan/detail/detail",
 				"style": {
 					"navigationBarTitleText": "拼团详情",
-					"enablePullDownRefresh": false,
+					"enablePullDownRefresh": true,
 					"navigationStyle": "custom"
 				}
 			},
@@ -29,7 +29,7 @@
 				"path": "seckill/detail/detail",
 				"style": {
 					"navigationBarTitleText": "秒杀详情",
-					"enablePullDownRefresh": false,
+					"enablePullDownRefresh": true,
 					"navigationStyle": "custom"
 				}
 			},
@@ -45,7 +45,7 @@
 				"path": "groupBuying/detail/detail",
 				"style": {
 					"navigationBarTitleText": "拼团详情",
-					"enablePullDownRefresh": false,
+					"enablePullDownRefresh": true,
 					"navigationStyle": "custom"
 				}
 			},
@@ -61,7 +61,7 @@
 				"path": "solitaire/detail/detail",
 				"style": {
 					"navigationBarTitleText": "接龙详情",
-					"enablePullDownRefresh": false,
+					"enablePullDownRefresh": true,
 					"navigationStyle": "custom"
 				}
 			},
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages.json b/CoreCms.Net.Uni-App/CoreShop/pages.json
index 05215b07..b2b54a73 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages.json
+++ b/CoreCms.Net.Uni-App/CoreShop/pages.json
@@ -45,7 +45,7 @@
 			"path": "pages/home/home",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
@@ -53,7 +53,7 @@
 			"path": "pages/cart/cart",
 			"style": {
 				"navigationBarTitleText": "购物车",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
@@ -61,7 +61,7 @@
 			"path": "pages/classify/classify",
 			"style": {
 				"navigationBarTitleText": "分类",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
@@ -77,7 +77,7 @@
 			"path": "pages/category/category",
 			"style": {
 				"navigationBarTitleText": "商品列表",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
@@ -85,7 +85,7 @@
 			"path": "pages/goods/detail",
 			"style": {
 				"navigationBarTitleText": "商品详情",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
@@ -501,7 +501,7 @@
 				"path": "pinTuan/detail/detail",
 				"style": {
 					"navigationBarTitleText": "拼团详情",
-					"enablePullDownRefresh": false,
+					"enablePullDownRefresh": true,
 					"navigationStyle": "custom"
 				}
 			},
@@ -517,7 +517,7 @@
 				"path": "seckill/detail/detail",
 				"style": {
 					"navigationBarTitleText": "秒杀详情",
-					"enablePullDownRefresh": false,
+					"enablePullDownRefresh": true,
 					"navigationStyle": "custom"
 				}
 			},
@@ -533,7 +533,7 @@
 				"path": "groupBuying/detail/detail",
 				"style": {
 					"navigationBarTitleText": "拼团详情",
-					"enablePullDownRefresh": false,
+					"enablePullDownRefresh": true,
 					"navigationStyle": "custom"
 				}
 			},
@@ -549,7 +549,7 @@
 				"path": "solitaire/detail/detail",
 				"style": {
 					"navigationBarTitleText": "接龙详情",
-					"enablePullDownRefresh": false,
+					"enablePullDownRefresh": true,
 					"navigationStyle": "custom"
 				}
 			},
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue b/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
index 1e1ece03..d6f5a2aa 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
@@ -102,12 +102,14 @@
 				</view>
 			</view>
 		</view>
+		<uv-loading-page :loading="loading" loading-text="加载中..." font-size="24rpx"
+			bgColor="rgba(255, 255, 255, 0.2)"></uv-loading-page>
 	</view>
 </template>
 
 <script setup lang="ts">
-	import { reactive, nextTick, computed } from 'vue';
-	import { onShow } from '@dcloudio/uni-app';
+	import { reactive, nextTick, computed, ref } from 'vue';
+	import { onShow, onPullDownRefresh } from '@dcloudio/uni-app';
 	import { handleStaticResources, hanldeShowModal, handleRouteSwitchTab, handleRouteNavigateTo, handleShowToast } from '@/core/utils';
 	import { queryCartList, deleteGoodsSingle, deleteGoodsSome } from '@/core/api';
 	import type { Response, CartListType, ShopConfigStoreType } from '@/core/models';
@@ -116,14 +118,14 @@
 		OpenPointEnum, PointExchangeModelEnum, ShowPointExchangePriceEnum, RouteSwitchTabEnum,
 		PointsGiveModeEnum, ShowPointsGiveMsgEnum,
 	} from '@/core/enum';
-	import { useSystemInfo } from '@/core/hooks';
+	import { useLoadingFn, useSystemInfo } from '@/core/hooks';
 	import { UserToken } from '@/core/consts'
 
 	// 获取项目配置
 	const shopConfigStore : ShopConfigStoreType = useShopConfigStore();
 	// 获取自定义导航栏高度
 	const { statusBarHeight } = useSystemInfo();
-
+	const loading = ref(true);
 	const state = reactive<{
 		isManage : boolean,
 		isAllSelect : boolean,
@@ -140,6 +142,9 @@
 		pointShowText: "",
 	})
 
+	const handleuGetCartList = useLoadingFn(getCartList, loading);
+
+
 	/** 是否显示积分兑换价格 */
 	const isShowPointRedemptionPrice = computed(() => {
 		return shopConfigStore.config.pointSwitch == OpenPointEnum.yes &&
@@ -155,14 +160,24 @@
 	})
 
 	onShow(() => {
-		state.isManage = true;
-		if (uni.getStorageSync(UserToken)) {
-			getCartList();
-		}
+		getCart();
 	})
 
+	onPullDownRefresh(async () => {
+		await getCart();
+		uni.stopPullDownRefresh();
+	});
+
+	async function getCart() {
+		state.isManage = true;
+		if (uni.getStorageSync(UserToken)) {
+			handleuGetCartList();
+		}
+	}
+
+
 	/** 获取购物车数据 */
-	const getCartList = async () => {
+	async function getCartList() {
 		const cartList : Response<any> = await queryCartList({
 			display: "all",
 			ids: ""
@@ -311,8 +326,8 @@
 
 	/** 去购买 */
 	const handleGoToBuy = () => {
-		const ids : Array<number>= state.cartList.filter(x=>x.select).map(x=>x.id);
-		
+		const ids : Array<number> = state.cartList.filter(x => x.select).map(x => x.id);
+
 		if (ids.length > 0) {
 			handleRouteNavigateTo(`/pages/order/submit/submit?cartIds=${ids.join(',')}`)
 		} else {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/category.vue b/CoreCms.Net.Uni-App/CoreShop/pages/category/category.vue
index bebf4b23..d479873c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/category/category.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/category.vue
@@ -7,8 +7,9 @@
 					</image>
 
 					<uv-input shape="circle" :placeholder="state.pageTitle ? state.pageTitle :`请输入关键词`"
-						prefixIcon="search" v-model="state.searchKey" :customStyle="{ 'background-color': '#fff','padding':'3px 9px' }"
-						@confirm="handleSearch" prefixIconStyle="font-size: 22px;color: #909399">
+						prefixIcon="search" v-model="state.searchKey"
+						:customStyle="{ 'background-color': '#fff','padding':'3px 9px' }" @confirm="handleSearch"
+						prefixIconStyle="font-size: 22px;color: #909399">
 						<template #suffix>
 							<view class="search-tit" @click="handleSearch">搜索</view>
 						</template>
@@ -114,12 +115,14 @@
 				</view>
 			</view>
 		</view>
+		<uv-loading-page :loading="loading" loading-text="加载中..." font-size="24rpx"
+			bgColor="rgba(255, 255, 255, 0.2)"></uv-loading-page>
 	</view>
 </template>
 <script setup lang="ts">
-	import { reactive } from 'vue';
-	import { useSystemInfo } from '@/core/hooks';
-	import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+	import { reactive, ref } from 'vue';
+	import { useLoadingFn, useSystemInfo } from '@/core/hooks';
+	import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app';
 	import { handleStaticResources, handleShowToast, splitArrayByStep } from '@/core/utils';
 	import type { Response, GoodsType, GoodsListType } from '@/core/models';
 	import { queryGoodsPageList } from '@/core/api';
@@ -143,8 +146,8 @@
 	}
 
 	// 获取自定义导航栏高度
-	const { statusBarHeight ,menuButtonHeight} = useSystemInfo();
-
+	const { statusBarHeight, menuButtonHeight } = useSystemInfo();
+	const loading = ref(true);
 	const state = reactive<{
 		searchKey : string;
 		page : number;
@@ -216,6 +219,10 @@
 		pageTitle: "",
 	})
 
+	let queryParams : QueryParams
+
+	const handleuQueryProduct = useLoadingFn(handleQueryData, loading);
+
 	onReachBottom(() => {
 		if (state.totalPages > state.page) {
 			state.page++;
@@ -225,12 +232,20 @@
 
 
 	onLoad((query : QueryParams) => {
+		queryParams = query;
 		/** 处理 query 然后获取商品列表  */
-		handleQueryData(query);
+		handleuQueryProduct(query);
+	});
+
+	onPullDownRefresh(async () => {
+		state.page = 1;
+		state.totalPages = 1;
+		await handleuQueryProduct(queryParams);
+		uni.stopPullDownRefresh();
 	});
 
 	/** 处理 options   */
-	const handleQueryData = (options : QueryParams) => {
+	async function handleQueryData(options : QueryParams) {
 		let where : any = {};
 		if (options?.id) {
 			where.catId = options?.id;
@@ -263,15 +278,11 @@
 			where.labelId = options.labelId;
 		}
 		state.where = where;
-		getGoodsPageList();
+		await getGoodsPageList();
 	}
 
 	/** 获取商品列表数据 */
 	const getGoodsPageList = async () => {
-		uni.showLoading({
-			title: '加载中'
-		});
-
 		let order : Array<string> = [];
 		if (state.sortVal) {
 			order.push(`sort ${state.sortVal}`)
@@ -306,7 +317,6 @@
 		let list = splitArrayByStep(goodsPageList.data.list, 2);
 		state.goodsList[0] = state.goodsList[0].concat(list[0]);
 		state.goodsList[1] = state.goodsList[1].concat(list[1]);
-		uni.hideLoading();
 	}
 
 	/** 点击筛选 */
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue
index 052c1bbc..bcf597ea 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-five/classify-five.vue
@@ -234,9 +234,7 @@
 
 	// 获取商品列表数据
 	const getGoodsPageList = async () => {
-		uni.showLoading({
-			title: '加载中'
-		});
+		
 		const goodsPageList : Response<GoodsListType> = await queryGoodsPageList({
 			page: state.page,
 			limit: 10,
@@ -246,7 +244,6 @@
 			state.totalPages = goodsPageList.data?.totalPages;
 			state.goodsList = state.goodsList.concat(goodsPageList.data?.list);
 		}
-		uni.hideLoading();
 	}
 
 	/** 获取购物车数量和价格 */
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue
index 97402f09..485bf70c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify-page/classify-four/classify-four.vue
@@ -158,9 +158,7 @@
 
 	/** 获取商品列表数据 */
 	const getGoodsPageList = async () => {
-		uni.showLoading({
-			title: '加载中'
-		});
+		
 		const goodsPageList : Response<GoodsListType> = await queryGoodsPageList({
 			page: state.page,
 			limit: 10,
@@ -170,7 +168,6 @@
 			state.totalPages = goodsPageList.data?.totalPages;
 			state.goodsList = state.goodsList.concat(goodsPageList.data?.list);
 		}
-		uni.hideLoading();
 	}
 
 	/** 获取购物车数量和价格 */
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
index 1f83f77f..1cee0a37 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
@@ -1,5 +1,5 @@
 <template>
-	<coreshop-page :isBack="false" bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom>
+	<coreshop-page :isBack="false" bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom needLoadingPage :loadingPage="loading">
 		<view class="layout-classify-page">
 			<!-- #ifndef MP-ALIPAY -->
 			<uv-navbar bgColor="#EEF3F7" :height="menuButtonHeight+'px'">
@@ -37,8 +37,8 @@
 </template>
 
 <script setup lang="ts">
-	import { onMounted, reactive, nextTick, watchEffect } from 'vue';
-	import { onHide } from '@dcloudio/uni-app';
+	import { onMounted, reactive, nextTick, watchEffect, ref } from 'vue';
+	import { onHide, onPullDownRefresh } from '@dcloudio/uni-app';
 	import { useShopConfigStore } from '@/core/store';
 	import { queryAllCategories } from '@/core/api';
 	import { GoodsListEnum } from '@/core/enum';
@@ -50,13 +50,14 @@
 	import classifyThree from './classify-page/classify-three/classify-three.vue';
 	import classifyFour from './classify-page/classify-four/classify-four.vue';
 	import classifyFive from './classify-page/classify-five/classify-five.vue';
-	import { useSystemInfo } from '@/core/hooks';
+	import { useLoadingFn, useSystemInfo } from '@/core/hooks';
 
 	// 获取项目配置
 	const shopConfigStore : ShopConfigStoreType = useShopConfigStore();
 
 	// 获取自定义导航栏高度
 	const { statusBarHeight, systemInfo, menuButtonHeight } = useSystemInfo();
+	const loading = ref(true);
 
 	const state = reactive<{
 		categoriesList : Array<CategoriesType>,
@@ -68,8 +69,11 @@
 		keyWord: "",
 	})
 
+	const handleuAllCategories = useLoadingFn(getAllCategories, loading);
+
+
 	onMounted(async () => {
-		getAllCategories();
+		handleuAllCategories();
 	})
 
 	watchEffect(() => {
@@ -81,8 +85,14 @@
 		uni.$emit(onClassifyPageHide);
 	});
 
+	onPullDownRefresh(async () => {
+		await handleuAllCategories()
+		uni.stopPullDownRefresh();
+	});
+
+
 	/** 获取购物车数量价格 */
-	const getAllCategories = async () => {
+	async function getAllCategories() {
 		const allCategories : Response<Array<CategoriesType>> = await queryAllCategories();
 		state.categoriesList = allCategories.data || [];
 	}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
index bd79d56f..15576d55 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
@@ -1,5 +1,5 @@
 <template>
-	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom>
+	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom needLoadingPage :loadingPage="loading">
 		<view class="goods-detail">
 			<!-- 商品详情 -->
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
@@ -25,8 +25,8 @@
 </template>
 
 <script setup lang="ts">
-	import { reactive } from 'vue';
-	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
+	import { reactive, ref } from 'vue';
+	import { onLoad, onShareAppMessage, onShareTimeline, onPullDownRefresh } from '@dcloudio/uni-app';
 	import { queryGoodsDetail, queryCartNum, queryGoodsDetailByToken, queryPromotionList, queryAddCart } from '@/core/api';
 	import type { Response, GoodsAgentListType, GoodsPromotionType, GoodsSkuListType } from "@/core/models";
 	import { PromotionEnum, AddCartEnum, PaymentTypeEnum, ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
@@ -38,6 +38,7 @@
 	import GoodsDetailSkuPopup from '@/pages/components/goods-detail/components/goods-detail-sku/goods-detail-sku.vue';
 	import GoodsDetailRecommend from '@/pages/components/goods-detail/components/goods-detail-recommend/goods-detail-recommend.vue';
 	import { useLoginStore } from '@/core/store';
+	import { useLoadingFn } from '@/core/hooks';
 
 	interface QueryParams {
 		id : number;
@@ -71,17 +72,32 @@
 		showSku: false,
 		skuPrice: 0,
 		shareUrl: "",
-	})
+	});
 
+	const loading = ref(true);
+	let productId : number;
+
+	const handleuGetGoodsDetail = useLoadingFn(getGoodsDetail, loading);
 	onLoad((query : QueryParams) => {
+		productId = Number(query.id);
+		getGoodsDetailWithPromotionList();
+	});
+
+	onPullDownRefresh(async () => {
+		await getGoodsDetailWithPromotionList();
+		uni.stopPullDownRefresh();
+	});
+
+
+	async function getGoodsDetailWithPromotionList() {
 		/** 获取商品详情 */
-		getGoodsDetail(Number(query.id));
+		handleuGetGoodsDetail(productId);
 		/** 获取商品促销列表 */
 		getPromotionList();
-	})
+	}
 
 	/** 获取商品详情 */
-	const getGoodsDetail = async (id : number) => {
+	async function getGoodsDetail(id : number) {
 		let goodsDetail : any = null;
 		if (uni.getStorageSync(UserToken)) {
 			goodsDetail = await queryGoodsDetailByToken({
@@ -132,7 +148,7 @@
 
 		/** 如果用户登录，获取购物车数量 */
 		if (uni.getStorageSync(UserToken)) {
-			getCartNum();
+			await getCartNum();
 		}
 	}
 
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue b/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
index ade13087..83a17f7d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
@@ -1,5 +1,5 @@
 <template>
-	<coreshop-page :isBack="false" bgColor="rgba(0,0,0,0)"  :isShowStatusBarHeight="false" showLoginModalDom>
+	<coreshop-page :isBack="false" bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom needLoadingPage :loadingPage="loading">
 		<view class="layout-home-page page-bg">
 			<image class="home-bg" :src="handleStaticResources('/static/images/home-bg.jpg')"></image>
 			<uv-navbar :title="shopConfigStore.config?.shopName"
@@ -27,7 +27,7 @@
 
 <script setup lang="ts">
 	import { onMounted, reactive, ref } from 'vue';
-	import { onPageScroll, onShow, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
+	import { onPageScroll, onShow, onShareAppMessage, onShareTimeline, onPullDownRefresh } from '@dcloudio/uni-app';
 	import { queryPageConfig, queryUserInfo } from '@/core/api';
 	import type { Response, PageConfigType, PageConfigItemsType, UserInfoType } from '@/core/models';
 	import CustomPage from '@/pages/components/custom-page/index.vue';
@@ -39,7 +39,7 @@
 	import { ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
 
 	/** 获取项目配置 */
-	const shopConfigStore = useShopConfigStore(); 
+	const shopConfigStore = useShopConfigStore();
 
 	/** 获取 用户数据 */
 	const userInfoStore = useUserInfoStore();
@@ -65,7 +65,16 @@
 		uni.$emit(onHomePageShow);
 	})
 
+	onPullDownRefresh(async () => {
+		await queryHomePageConfig();
+		uni.stopPullDownRefresh();
+	});
+
 	onMounted(async () => {
+		queryHomePageConfig();
+	})
+
+	const queryHomePageConfig = async () => {
 		handleuQueryPageConfig()
 		if (uni.getStorageSync(UserToken)) {
 			getUserInfo();
@@ -76,8 +85,9 @@
 			url: shareUrl,
 			type: ShareModelEnum.url,
 			page: ShareEnum.index,
-		})
-	})
+		});
+		shopConfigStore.querySystemConfig();
+	}
 
 	async function getPageConfig() {
 		const pageConfig : Response<PageConfigType> = await queryPageConfig({ code: 'mobile_home' });
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
index bd93b473..3ccb7fa8 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
@@ -1,5 +1,6 @@
 <template>
-	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom>
+	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom
+		needLoadingPage :loadingPage="loadingPage">
 		<view class="goods-detail">
 			<!-- 商品详情 -->
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
@@ -62,7 +63,7 @@
 </template>
 <script setup lang="ts">
 	import { reactive, ref } from 'vue';
-	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
+	import { onLoad, onShareAppMessage, onShareTimeline, onPullDownRefresh } from '@dcloudio/uni-app';
 	import { queryActivityDetial, queryCartNum, queryAddCart } from '@/core/api';
 	import { PaymentTypeEnum, ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
 	import type { Response } from '@/core/models';
@@ -119,15 +120,22 @@
 	});
 
 	const loading = ref(false);
-	const handleBuyNow = useLoadingFn(onBuyNow, loading)
+	const loadingPage = ref(true);
+	const handleBuyNow = useLoadingFn(onBuyNow, loading);
+	const handleGetGoodsDetail = useLoadingFn(getGoodsDetail, loadingPage);
 
 	onLoad((query : QueryParams) => {
 		state.id = Number(query.id);
 		/** 获取商品详情 */
-		getGoodsDetail();
-	})
+		handleGetGoodsDetail();
+	});
 
-	const getGoodsDetail = async () => {
+	onPullDownRefresh(async () => {
+		await handleGetGoodsDetail();
+		uni.stopPullDownRefresh();
+	});
+
+	async function getGoodsDetail() {
 		let data = {
 			id: state.id,
 			type: PaymentTypeEnum.group,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
index 3cd8d5ad..4e59d943 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
@@ -1,5 +1,6 @@
 <template>
-	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom>
+	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom
+		needLoadingPage :loadingPage="loadingPage">
 		<view class="goods-detail">
 			<!-- 商品详情 -->
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
@@ -70,7 +71,7 @@
 </template>
 <script setup lang="ts">
 	import { reactive, ref } from 'vue';
-	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
+	import { onLoad, onShareAppMessage, onShareTimeline, onPullDownRefresh } from '@dcloudio/uni-app';
 	import { queryPinTuanGoodsDetail, queryCartNum, queryAddCart, queryOrderPinTuanTeamInfo } from '@/core/api';
 	import type { Response } from '@/core/models';
 	import { UserToken, shareUrl } from '@/core/consts'
@@ -129,7 +130,9 @@
 	});
 
 	const loading = ref(false);
-	const handleBuyNow = useLoadingFn(onBuyNow, loading)
+	const loadingPage = ref(true);
+	const handleBuyNow = useLoadingFn(onBuyNow, loading);
+	const handleGetGoodsDetail = useLoadingFn(getGoodsDetail, loadingPage);
 
 	onLoad((query : QueryParams) => {
 		if (query?.teamId) {
@@ -141,10 +144,15 @@
 		}
 		/** 获取商品详情 */
 		state.id = Number(query.id);
-		getGoodsDetail();
-	})
+		handleGetGoodsDetail();
+	});
 
-	const getGoodsDetail = async () => {
+	onPullDownRefresh(async () => {
+		await handleGetGoodsDetail();
+		uni.stopPullDownRefresh();
+	});
+
+	async function getGoodsDetail() {
 		let data = {
 			id: state.id,
 			data: true,
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
index d5803c84..7eccbcaf 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
@@ -1,5 +1,6 @@
 <template>
-	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom>
+	<coreshop-page bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" :placeholder="false" showLoginModalDom
+		needLoadingPage :loadingPage="loadingPage">
 		<view class="goods-detail">
 			<!-- 商品详情 -->
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
@@ -61,7 +62,7 @@
 </template>
 <script setup lang="ts">
 	import { reactive, ref } from 'vue';
-	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
+	import { onLoad, onShareAppMessage, onShareTimeline, onPullDownRefresh } from '@dcloudio/uni-app';
 	import { queryActivityDetial, queryCartNum, queryShare, queryAddCart } from '@/core/api';
 	import { PaymentTypeEnum, ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
 	import type { Response } from '@/core/models';
@@ -119,15 +120,22 @@
 	});
 
 	const loading = ref(false);
-	const handleSeckillNow = useLoadingFn(onSeckillNow, loading)
+	const loadingPage = ref(true);
+	const handleSeckillNow = useLoadingFn(onSeckillNow, loading);
+	const handleGetGoodsDetail = useLoadingFn(getGoodsDetail, loadingPage);
 
 	onLoad((query : QueryParams) => {
 		state.id = Number(query.id);
 		/** 获取商品详情 */
-		getGoodsDetail();
-	})
+		handleGetGoodsDetail();
+	});
 
-	const getGoodsDetail = async () => {
+	onPullDownRefresh(async () => {
+		await handleGetGoodsDetail();
+		uni.stopPullDownRefresh();
+	});
+
+	async function getGoodsDetail() {
 		let data = {
 			id: state.id,
 			type: PaymentTypeEnum.seckill,
@@ -152,7 +160,7 @@
 		state.spesDesc = goodsDetail?.data?.product?.spesDesc;
 		/** 如果用户登录，获取购物车数量 */
 		if (uni.getStorageSync(UserToken)) {
-			getCartNum();
+			await getCartNum();
 		}
 
 		state.shareUrl = await getShareUrl({
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/solitaire/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/solitaire/detail/detail.vue
index 581fb0a1..924bc635 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/solitaire/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/solitaire/detail/detail.vue
@@ -1,5 +1,6 @@
 <template>
-	<coreshop-page title="接龙详情" mode="left" bgColor="#D33123" titleColor="#fff" showLoginModalDom>
+	<coreshop-page title="接龙详情" mode="left" bgColor="#D33123" titleColor="#fff" showLoginModalDom needLoadingPage
+		:loadingPage="loadingPage">
 		<view class="layout-solitaire-box">
 			<view class="config-box">
 				<image class="img" :src="shopConfigStore?.config?.shopLogo"></image>
@@ -96,8 +97,8 @@
 	</coreshop-page>
 </template>
 <script setup lang="ts">
-	import { reactive } from 'vue';
-	import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
+	import { reactive, ref } from 'vue';
+	import { onLoad, onShareAppMessage, onShareTimeline, onPullDownRefresh } from '@dcloudio/uni-app';
 	import { querySolitaireDetail, queryShare, queryAddCart, queryRemoveCart } from '@/core/api';
 	import { ShareClientEnum, ShareModelEnum, ShareEnum, EmptyEnum, PaymentTypeEnum, AddCartEnum } from '@/core/enum';
 	import type { Response } from '@/core/models';
@@ -106,6 +107,7 @@
 	import { handleShowToast, handleRouteNavigateTo, getShareUrl } from '@/core/utils';
 	import { timeFormat } from '@/uni_modules/uv-ui-tools/libs/function/index.js';
 	import CoreshopShare from '@/components/coreshop-share/coreshop-share.vue';
+	import { useLoadingFn } from '@/core/hooks';
 
 	interface QueryParams {
 		id : number;
@@ -135,13 +137,21 @@
 		showShare: false,
 	});
 
+	const loadingPage = ref(true);
+	const handleGetGoodsDetail = useLoadingFn(getGoodsDetail, loadingPage);
 	onLoad((query : QueryParams) => {
 		state.id = Number(query.id);
 		/** 获取商品详情 */
-		getGoodsDetail();
-	})
+		handleGetGoodsDetail();
+	});
 
-	const getGoodsDetail = async () => {
+	onPullDownRefresh(async () => {
+		await handleGetGoodsDetail();
+		uni.stopPullDownRefresh();
+	});
+
+
+	async function getGoodsDetail() {
 		const solitaireData : Response<any> = await querySolitaireDetail({ id: state.id });
 		if (solitaireData.status) {
 			state.solitaireInfo = solitaireData.data.model;

From f458b823409fba05c1a84903dc9dd538cc5b66fe Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Thu, 24 Oct 2024 09:38:49 +0800
Subject: [PATCH 10/15] =?UTF-8?q?uniapp=E3=80=90=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=91:=20=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E7=94=9F=E6=88=90=E6=B5=B7=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
index 15576d55..782792b6 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
@@ -5,7 +5,7 @@
 			<GoodsDetail :goodsId="state.goodsDetailData?.id" :goodsDetailData="state.goodsDetailData"
 				:swiperBanner="state.swiperBanner" :goodsDetailContent="state.goodsDetailContent"
 				:userAgentGrade="state.userAgentGrade" :agentProductsList="state.agentProductsList"
-				:goodsPromotionList="state.goodsPromotionList" :spesDesc="state.spesDesc"
+				:goodsPromotionList="state.goodsPromotionList" :spesDesc="state.spesDesc" :shareType="ShareEnum.goods"
 				@hanldeShowGoodSku="hanldeShowGoodSku">
 			</GoodsDetail>
 

From 18afd5c79cfb0d59555759e0830b9e816aa42123 Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Thu, 24 Oct 2024 09:39:38 +0800
Subject: [PATCH 11/15] =?UTF-8?q?uniapp=E3=80=90=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=91:=20=E5=90=8E=E5=8F=B0=E5=88=86=E9=94=80=E5=95=86?=
 =?UTF-8?q?=E6=B5=B7=E6=8A=A5=EF=BC=8C=E5=90=8E=E5=8F=B0=E4=BB=A3=E7=90=86?=
 =?UTF-8?q?=E5=95=86=E6=B5=B7=E6=8A=A5=EF=BC=8C=E5=88=86=E4=BA=AB=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/pages/share/jump/jump.vue               | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue b/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
index 3d328a97..36de045e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/jump/jump.vue
@@ -49,7 +49,11 @@
 					break;
 				/** 店铺邀请*/
 				case ShareEnum.inv:
-					/** 有待补充 */
+					if (shareData.data?.params?.store) {
+						handleRouteRedirectTo(`/pages/subpackage/distribution/store/index?store=${shareData.data?.params?.store}`)
+					} else {
+						handleRouteSwitchTab();
+					}
 					break;
 				/** 文章页面 */
 				case ShareEnum.article:
@@ -101,7 +105,11 @@
 					break;
 				/** 代理商*/
 				case ShareEnum.agent:
-					/** 有待补充 */
+					if (shareData.data?.params?.store) {
+						handleRouteRedirectTo(`/pages/subpackage/agency/store/index?store=${shareData.data?.params?.store}`)
+					} else {
+						handleRouteSwitchTab();
+					}
 					break;
 				/** 接龙*/
 				case ShareEnum.solitaire:

From 40e05f817dec9ca9150df0072411242203a1dd88 Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Thu, 24 Oct 2024 09:40:13 +0800
Subject: [PATCH 12/15] =?UTF-8?q?uniapp=E3=80=90=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=91:=20=E6=B5=B7=E6=8A=A5=E4=B8=8B=E8=BD=BD=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/share/sharePoster/sharePoster.vue   | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue b/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
index d2179763..f4a3db6a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
@@ -349,24 +349,15 @@
 		uni.authorize({
 			scope: 'scope.writePhotosAlbum',
 			success() {
-				// 先下载到本地
-				uni.downloadFile({
-					url: state.imgSrc,
-					success(res : any) {
-						uni.saveImageToPhotosAlbum({
-							filePath: res.tempFilePath,
-							success() {
-								handleShowToast('保存成功', 'success');
-							},
-							fail() {
-								handleShowToast('图片保存失败', 'error');
-							}
-						});
+				uni.saveImageToPhotosAlbum({
+					filePath: state.imgSrc,
+					success() {
+						handleShowToast('保存成功', 'success');
 					},
 					fail() {
-						handleShowToast('下载失败', 'error');
+						handleShowToast('图片保存失败', 'error');
 					}
-				})
+				});
 			}
 		})
 		// #endif 

From 112c9b098f4d7f4799ff9e0c44c9aee8fac28605 Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Thu, 24 Oct 2024 11:30:30 +0800
Subject: [PATCH 13/15] =?UTF-8?q?uniapp=E3=80=90=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91:=20=E6=B5=B7=E6=8A=A5=E5=A2=9E=E5=8A=A0=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/pages/share/sharePoster/sharePoster.scss       | 6 ++++++
 .../CoreShop/pages/share/sharePoster/sharePoster.vue        | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.scss b/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.scss
index c4988246..c1687a29 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.scss
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.scss
@@ -42,3 +42,9 @@
 		font-size: 28rpx;
 	}
 }
+
+.tip-box{
+	padding: 20rpx 50rpx;
+	font-size: 24rpx;
+	color: #aaa;
+}
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue b/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
index f4a3db6a..010f800c 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/sharePoster/sharePoster.vue
@@ -53,7 +53,9 @@
 					</lpainterView>
 				</lpainterView>
 			</LPainter>
-
+			<view class="tip-box" v-if="state.imgSrc">
+				注：如果您下载失败，或者以前拒绝过弹出的授权相册提醒，请点击右上角三个点，进入【设置】页面，开启【添加到相册】功能。
+			</view>
 			<view class="btn-box">
 				<view class="btn">
 					<view class="back" @click="handlenNavigateBack">返回上一页</view>
@@ -345,7 +347,7 @@
 		})
 		// #endif
 
-		// #ifdef MP
+		// #ifdef MP  
 		uni.authorize({
 			scope: 'scope.writePhotosAlbum',
 			success() {

From 0ba94842d79bdee1773ff4078c618ec7ad5566c2 Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Thu, 24 Oct 2024 11:31:20 +0800
Subject: [PATCH 14/15] =?UTF-8?q?uniapp=E3=80=90=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91:=20=E4=BC=98=E5=8C=96=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/pages-config.json                |  3 +-
 .../pages-config/subpackage-custom.json       | 13 +++
 CoreCms.Net.Uni-App/CoreShop/pages.json       | 20 +++++
 .../pages/subpackage/custom/custom.vue        | 83 +++++++++----------
 4 files changed, 76 insertions(+), 43 deletions(-)
 create mode 100644 CoreCms.Net.Uni-App/CoreShop/pages-config/subpackage-custom.json

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages-config.json b/CoreCms.Net.Uni-App/CoreShop/pages-config.json
index 6d7005be..5395fd73 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages-config.json
+++ b/CoreCms.Net.Uni-App/CoreShop/pages-config.json
@@ -31,7 +31,8 @@
 		"pages-config/subpackage-storeMap.json",
 		"pages-config/subpackage-distribution.json",
 		"pages-config/subpackage-agency.json",
-		"pages-config/subpackage-merchant.json"
+		"pages-config/subpackage-merchant.json",
+		"pages-config/subpackage-custom.json"
 	],
 
 	"preloadRule": "pages-config/preloadRule.json",
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages-config/subpackage-custom.json b/CoreCms.Net.Uni-App/CoreShop/pages-config/subpackage-custom.json
new file mode 100644
index 00000000..b9d77706
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/pages-config/subpackage-custom.json
@@ -0,0 +1,13 @@
+{
+	"subPackages": [{
+		"root": "pages/subpackage/custom",
+		"pages": [{
+			"path": "custom",
+			"style": {
+				"navigationBarTitleText": "自定义首页",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		}]
+	}]
+}
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages.json b/CoreCms.Net.Uni-App/CoreShop/pages.json
index b2b54a73..1e570c5f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages.json
+++ b/CoreCms.Net.Uni-App/CoreShop/pages.json
@@ -785,10 +785,30 @@
 				"navigationStyle": "custom"
 			}
 		}]
+	},{
+		"root": "pages/subpackage/custom",
+		"pages": [{
+			"path": "custom",
+			"style": {
+				"navigationBarTitleText": "自定义首页",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		}]
 	}],
 	"preloadRule": {
 		"pages/member/member": {
 			"network": "all",
 			"packages": ["pages/subpackage/member"]
 		}
+	},
+	"condition" : { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [
+			{
+				"name": "", //模式名称
+				"path": "", //启动页面，必选
+				"query": "" //启动参数，在页面的onLoad函数里面得到
+			}
+		]
 	}}
\ No newline at end of file
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 1729651f..eae152b1 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/custom/custom.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/custom/custom.vue
@@ -1,58 +1,56 @@
 <template>
-	<view class="layout-home-page page-bg">
-		<image class="home-bg" :src="handleStaticResources('/static/images/home-bg.jpg')"></image>
-		<uv-navbar :bg-color="state.isScrollTop ? handleStaticResources('/static/images/home-bg.jpg') : 'rgba(0,0,0,0)'"
-			imgMode="aspectFill">
-			<template #left>
-				<view class="search-box">
-					<image class="logo" :src="handleStaticResources('/static/images/home-logo.png')"></image>
-					<uv-input shape="circle" placeholder="请输入关键词" prefixIcon="search"
-						:customStyle="{ 'background-color': '#fff' }" prefixIconStyle="font-size: 22px;color: #909399">
-						<template #suffix>
-							<view class="search-tit">搜索</view>
-						</template>
-					</uv-input>
-				</view>
-			</template>
-		</uv-navbar>
+	<coreshop-page :isBack="false" bgColor="rgba(0,0,0,0)" :isShowStatusBarHeight="false" showLoginModalDom>
+		<view class="layout-home-page page-bg">
+			<image class="home-bg" :src="handleStaticResources('/static/images/home-bg.jpg')"></image>
+			<uv-navbar
+				:bg-color="state.isScrollTop ? handleStaticResources('/static/images/home-bg.jpg') : 'rgba(0,0,0,0)'"
+				imgMode="aspectFill">
+				<template #left>
+					<view class="search-box">
+						<image class="logo" :src="handleStaticResources('/static/images/home-logo.png')"></image>
+						<uv-input shape="circle" placeholder="请输入关键词" prefixIcon="search"
+							:customStyle="{ 'background-color': '#fff' }"
+							prefixIconStyle="font-size: 22px;color: #909399">
+							<template #suffix>
+								<view class="search-tit">搜索</view>
+							</template>
+						</uv-input>
+					</view>
+				</template>
+			</uv-navbar>
 
-		<view class="content-box p-25" :style="{ 'padding-top': `${statusBarHeight + 10}px` }">
-			<CustomPage :coreshopData="state.coreshopData"></CustomPage>
+			<view class="content-box p-25">
+				<CustomPage :coreshopData="state.coreshopData"></CustomPage>
+			</view>
+
+			<!-- 备案信息 -->
+			<coreshop-copyright></coreshop-copyright>
+
+			<!-- 弹框广告 -->
+			<HomeAdpop></HomeAdpop>
 		</view>
-
-		<!-- 备案信息 -->
-		<coreshop-copyright></coreshop-copyright>
-
-		<!-- 弹框广告 -->
-		<HomeAdpop></HomeAdpop>
-
-		<!-- 登录弹框 -->
-		<coreshop-login-modal></coreshop-login-modal>
-	</view>
+	</coreshop-page>
 </template>
 
 <script setup lang="ts">
-	import { onPageScroll, onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
+	import { onShow,onPageScroll, onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
 	import { reactive } from 'vue';
 	import { queryPageConfig, queryUserInfo } from '@/core/api';
 	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, getDefaultShareData, getShareUrl } from '@/core/utils';
-	import { useSystemInfo } from '@/core/hooks';
-	import { UserToken, shareUrl } from '@/core/consts';
+	import { handleStaticResources, getDefaultShareData, getShareUrl } from '@/core/utils'; 
+	import { UserToken, shareUrl,onHomePageShow } from '@/core/consts';
 	import { useUserInfoStore } from '@/core/store';
 	import { ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
 
 	interface QueryParams {
 		code : string;
 	}
-
-	/** 获取自定义导航栏高度 */
-	const { statusBarHeight } = useSystemInfo();
+ 
 	/** 获取 用户数据 */
 	const userInfoStore = useUserInfoStore();
-
+	
 	const state = reactive<{
 		coreshopData : Array<PageConfigItemsType>;
 		isScrollTop : boolean;
@@ -62,13 +60,14 @@
 		isScrollTop: false,
 		shareUrl: "",
 	})
-
+	
+	onShow(() => {
+		/** 触发自定义onshow事件，让后代组件监听页面是都进入 */
+		uni.$emit(onHomePageShow);
+	})
+	
 	onPageScroll((e : any) => {
-		if (e.scrollTop > 10) {
-			state.isScrollTop = true;
-		} else {
-			state.isScrollTop = false;
-		}
+		state.isScrollTop = e.scrollTop > 10;
 	})
 
 	onLoad(async (query : QueryParams) => {

From 1ef91351ef238f1d6b5ff06d76fa87db93ba840e Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Thu, 24 Oct 2024 11:38:52 +0800
Subject: [PATCH 15/15] =?UTF-8?q?uniapp=E3=80=90=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91:=20=E5=88=86=E9=94=80=E9=A1=B5=E9=9D=A2=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CoreShop/pages/subpackage/distribution/store/index.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store/index.vue
index 46084fd7..ebeaa30a 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/distribution/store/index.vue
@@ -78,7 +78,7 @@
 	import { reactive } from 'vue';
 	import { onLoad, onReachBottom, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
 	import { queryDistributionStoreInfo, queryShare, queryGoodsPageList } from '@/core/api';
-	import { handleStaticResources, splitArrayByStep, handleShowToast, handleRouteNavigateTo } from '@/core/utils';
+	import { handleStaticResources, splitArrayByStep, handleShowToast, handleRouteNavigateTo, getShareUrl } from '@/core/utils';
 	import type { Response, GoodsType } from '@/core/models';
 	import { ShareClientEnum, ShareModelEnum, ShareEnum } from '@/core/enum';
 	import { shareUrl, UserToken } from '@/core/consts';