wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 16:23:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/bob_status_hegiht' into 'dev'

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

See merge request jianweie/coreshoppro!51
This commit is contained in:
bob bob
2024-10-22 16:29:32 +00:00
parent 84f003d43f bad96fa0e4
commit faef498dc6
10 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.scss
View File

@@ -38,7 +38,7 @@
}
.data-box {
padding-top: 100rpx;
padding-top: 60rpx;
.item-box {
margin-bottom: 30rpx;

2
CoreCms.Net.Uni-App/CoreShop/pages/cart/cart.vue
View File

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

2
CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue
View File

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

5
CoreCms.Net.Uni-App/CoreShop/pages/goods/detail.vue
View File

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

6
CoreCms.Net.Uni-App/CoreShop/pages/member/member.scss
View File

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

4
CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue
View File

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

2
CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.scss
View File

@@ -449,7 +449,7 @@
}
.btn {
width: 200rpx;
width: 240rpx;
text-align: center;
height: 90rpx;
line-height: 90rpx;

6
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/detail/detail.vue
View File

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

6
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/pinTuan/detail/detail.vue
View File

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

6
CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/seckill/detail/detail.vue
View File

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