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] =?UTF-8?q?uniapp=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91:=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E5=8A=A0=E8=BD=BD=E7=8A=B6?=
 =?UTF-8?q?=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;