From 579b9bd86698fc30b2be61c0fba8733607e1889e 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: Wed, 16 Oct 2024 00:01:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=88=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=AE=B9=E5=99=A8=EF=BC=89=EF=BC=9A=E9=A1=B5=E9=9D=A2=E5=AE=B9?=
 =?UTF-8?q?=E5=99=A8=E6=B7=BB=E5=8A=A0=E9=AA=A8=E6=9E=B6=E5=B1=8F=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coreshop-page-content.vue                 | 53 +++++++++++++++++++
 .../coreshop-page/coreshop-page.vue           | 53 ++++++++++++++-----
 .../CoreShop/core/hooks/index.ts              |  1 +
 .../CoreShop/core/hooks/use-loading.ts        | 11 ++++
 .../CoreShop/pages/home/home.vue              | 34 +++++++-----
 5 files changed, 126 insertions(+), 26 deletions(-)
 create mode 100644 CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue
 create mode 100644 CoreCms.Net.Uni-App/CoreShop/core/hooks/use-loading.ts

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
new file mode 100644
index 00000000..013a4e51
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page-content/coreshop-page-content.vue
@@ -0,0 +1,53 @@
+<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="{ 'padding-top': `${props.isShowStatusBarHeight ? statusBarHeight : 0}px`, ...props.contentStyle }">
+			<slot></slot>
+		</view>
+		<template v-if="props.showLoginModalDom">
+			<coreshop-login-modal :show="_useLoginStore.showLoginModalTogglePop"
+				@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<{
+		isBack : boolean,
+		bgColor : string,
+		titleColor : string,
+		mode : string,
+		title : string,
+		isShowStatusBarHeight : boolean;
+		customStyle : any;
+		contentStyle : any;
+		handleCustomRouteJump : () => void | null,
+		showLoginModalDom : boolean;
+	}>(), {
+		isBack: true,
+		bgColor: '#EEF3F7',
+		titleColor: '#000',
+		mode: 'center',
+		title: '',
+		isShowStatusBarHeight: true,
+		customStyle: {},
+		contentStyle: {},
+		handleCustomRouteJump: null,
+		showLoginModalDom: false
+	});
+
+	/** 打开获取关闭login弹框 */
+	const handleChangeLoginPopup = (isShow : boolean) => {
+		_useLoginStore.setShowLoginModalTogglePop(isShow);
+	}
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
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 013a4e51..770e6903 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
@@ -1,5 +1,5 @@
 <template>
-	<view class="layout-page-box page-bg" :style="props.customStyle">
+	<!-- <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"
@@ -8,29 +8,50 @@
 		</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>
+	</view> -->
+
+	<template>
+		<template v-if="props.needSkeleton">
+			<uv-skeletons :skeleton="props.skeleton" :loading="props.skeletonLoading">
+				<coreshop-page-content v-bind="props">
+					<slot name="default" />
+				</coreshop-page-content>
+			</uv-skeletons>
+		</template>
+
+		<template v-else>
+			<coreshop-page-content v-bind="props">
+				<slot name="default" />
+			</coreshop-page-content>
+		</template>
+	</template>
+
 </template>
 <script setup lang="ts">
-	import { useSystemInfo } from '@/core/hooks';
-	import { useLoginStore } from '@/core/store';
+	// import { useSystemInfo } from '@/core/hooks';
+	// import { useLoginStore } from '@/core/store';
 
 	// 获取自定义导航栏高度
-	const { statusBarHeight } = useSystemInfo();
-	const _useLoginStore = useLoginStore();
+	// const { statusBarHeight } = useSystemInfo();
+	// const _useLoginStore = useLoginStore();
 
 	const props = withDefaults(defineProps<{
 		isBack : boolean,
 		bgColor : string,
 		titleColor : string,
 		mode : string,
-		title : string,
+		title : string;
 		isShowStatusBarHeight : boolean;
 		customStyle : any;
 		contentStyle : any;
 		handleCustomRouteJump : () => void | null,
 		showLoginModalDom : boolean;
+		needSkeleton : boolean;
+		skeleton ?: Array<object>;
+		skeletonLoading : boolean;
 	}>(), {
 		isBack: true,
 		bgColor: '#EEF3F7',
@@ -41,13 +62,21 @@
 		customStyle: {},
 		contentStyle: {},
 		handleCustomRouteJump: null,
-		showLoginModalDom: false
+		showLoginModalDom: false,
+		needSkeleton: false,
+		skeleton: [{
+			type: 'line',
+			num: 3,
+			gap: '20rpx',
+			style: ['width: 200rpx;marginBottom: 50rpx;', 'height: 100rpx;', 'width: 500rpx;'],
+		}],
+		skeletonLoading: false
 	});
 
 	/** 打开获取关闭login弹框 */
-	const handleChangeLoginPopup = (isShow : boolean) => {
-		_useLoginStore.setShowLoginModalTogglePop(isShow);
-	}
+	// const handleChangeLoginPopup = (isShow : boolean) => {
+	// 	_useLoginStore.setShowLoginModalTogglePop(isShow);
+	// }
 </script>
 <style lang="scss" scoped>
 </style>
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/core/hooks/index.ts b/CoreCms.Net.Uni-App/CoreShop/core/hooks/index.ts
index 57e9de48..015a01b7 100644
--- a/CoreCms.Net.Uni-App/CoreShop/core/hooks/index.ts
+++ b/CoreCms.Net.Uni-App/CoreShop/core/hooks/index.ts
@@ -1,2 +1,3 @@
 /** 系统配置 */
 export * from './systemInfo';
+export * from './use-loading';
diff --git a/CoreCms.Net.Uni-App/CoreShop/core/hooks/use-loading.ts b/CoreCms.Net.Uni-App/CoreShop/core/hooks/use-loading.ts
new file mode 100644
index 00000000..6c6213d1
--- /dev/null
+++ b/CoreCms.Net.Uni-App/CoreShop/core/hooks/use-loading.ts
@@ -0,0 +1,11 @@
+import { Ref } from "vue";
+
+export function useLoadingFn<T extends Array<unknown>, R>(fn : (...args : T) => Promise<R>, loading : Ref<boolean>) {
+	function wrapper(this, ...args : T) {
+		loading.value = true;
+		return new Promise<R>((resolve, reject) =>
+			Promise.resolve(fn.apply(this, args)).then(resolve).catch(reject)
+		).finally(() => loading.value = false);
+	}
+	return wrapper;
+}
\ No newline at end of file
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue b/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
index fee2b800..2b799e76 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/home/home.vue
@@ -26,7 +26,7 @@
 
 <script setup lang="ts">
 	import { onPageScroll } from '@dcloudio/uni-app';
-	import { onMounted, reactive } from 'vue';
+	import { onMounted, reactive, ref } 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';
@@ -35,6 +35,7 @@
 	import { useSystemInfo } from '@/core/hooks';
 	import { UserToken } from '@/core/consts';
 	import { useUserInfoStore, useShopConfigStore } from '@/core/store';
+	import { useLoadingFn } from '@/core/hooks'
 
 	/** 获取项目配置 */
 	const shopConfigStore = useShopConfigStore();
@@ -45,6 +46,10 @@
 	/** 获取 用户数据 */
 	const userInfoStore = useUserInfoStore();
 
+	const loading = ref(true);
+
+	const handleuQueryPageConfig = useLoadingFn(getPageConfig, loading);
+
 	const state = reactive<{
 		coreshopData : Array<PageConfigItemsType>;
 		isScrollTop : boolean;
@@ -53,24 +58,25 @@
 		isScrollTop: false,
 	})
 
-	const getPageConfig = async () => {
+	// const getPageConfig = async () => {
+	// 	const pageConfig : Response<PageConfigType> = await queryPageConfig({ code: 'mobile_home' });
+	// 	state.coreshopData = pageConfig.data?.items;
+	// }
+
+	onMounted(() => {
+		handleuQueryPageConfig()
+		if (uni.getStorageSync(UserToken)) {
+			getUserInfo();
+		}
+	})
+
+	async function getPageConfig() {
 		const pageConfig : Response<PageConfigType> = await queryPageConfig({ code: 'mobile_home' });
 		state.coreshopData = pageConfig.data?.items;
 	}
 
 	onPageScroll((e : any) => {
-		if (e.scrollTop > 10) {
-			state.isScrollTop = true;
-		} else {
-			state.isScrollTop = false;
-		}
-	})
-
-	onMounted(() => {
-		getPageConfig();
-		if (uni.getStorageSync(UserToken)) {
-			getUserInfo();
-		}
+		state.isScrollTop = e.scrollTop > 10;
 	})
 
 	/** 获取用户信息 */