uniapp【修复】：修复同步导行栏高度

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,

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">

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);

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;

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">

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"

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>;

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>
 

CoreCms.Net.Uni-App/CoreShop/pages/member/member.scss

@@ -2,14 +2,14 @@
 	position: relative;
 	.memeber-bg{
 		display: block;
-		width: 750rpx;
+		width: 100%;
-		height: 600rpx;
+		height: 400rpx;
 	}
 }
 
 .head-box {
 	position: absolute;
-	bottom: 13rpx;
+	bottom: 0;
 	left: 0;  
 	 width: 100%;
 	.user-info {

CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue

@@ -1,6 +1,6 @@
 <template>
-	<coreshop-page :title="state.isScrollToTop ? '' : userInfoStore.userInfo?.nickName || ''" titleColor="#fff"
+	<coreshop-page :title=" userInfoStore.userInfo?.nickName || ''" titleColor="#fff"
-		mode="left" :bgColor=" state.isScrollToTop ? 'rgba(0,0,0,0)':'#d33123'" :isShowStatusBarHeight="false"
+		mode="left" bgColor="#d33123" :isShowStatusBarHeight="false"
 		:isBack="false" showLoginModalDom>
 		<view class="layout-member-page">
 			<view class="member-head">

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;

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>;

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;
@@ -96,6 +96,8 @@
 	/** 获取购物车数据 */
 	const cartStore = useCartStore();
 	
+	const { statusBarHeight } = useSystemInfo();
+
 	const state = reactive<{
 		id : number;
 		goodsDetailData : any,

CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/list/list.scss

@@ -11,7 +11,6 @@
 	.content-box {
 		position: relative;
 		margin: 25rpx;
-		padding-top: 200rpx;
 		
 		.title-box {
 			display: flex;

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;
@@ -84,6 +84,8 @@
 
 	const cartStore = useCartStore();
 	
+	const { statusBarHeight } = useSystemInfo();
+
 	const state = reactive<{
 		goodsDetailData : any,
 		swiperBanner : Array<string>;

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;