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] =?UTF-8?q?uniapp=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91:=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=87=AA=E5=AE=9A=E4=B9=89=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) => {