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] =?UTF-8?q?uniapp=E3=80=90=E9=80=82=E9=85=8D=E3=80=91?=
 =?UTF-8?q?=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();