wwl
/
bk-shop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

main
wwl 2024-03-15 14:39:36 +08:00
parent 77fc731426
commit 2b0a5953ce
8 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/sp-coupon/index.scss
View File

@ -246,7 +246,8 @@
}
&-btn {
padding: 15px 20px;
border: 1px solid #fff;
/* prettier-ignore */
border: 1PX solid #fff;
border-radius: 6px;
display: flex;
justify-content: center;

7
src/components/sp-page/index.js
View File

@ -196,7 +196,7 @@ function SpPage (props, ref) {
let model = ''
let ipx = false
let gNavbarH = 0, gStatusBarHeight = 0
let gNavbarH = 0, gStatusBarHeight = 0, gAreaH = 0
// let customNavigation = false
// let cusCurrentPage = 0
@ -207,7 +207,8 @@ function SpPage (props, ref) {
ipx = model.search(/iPhone\s*X|iPhone\s*11|iPhone\s*12|iPhone\s*13|iPhone\s*14|iPhone\s*15|iPhone\s*16|iPhone\s*10/g) > -1
const menuButton = Taro.getMenuButtonBoundingClientRect()
const { statusBarHeight } = Taro.getSystemInfoSync()
const { statusBarHeight, safeArea, screenHeight } = deviceInfo
gAreaH = (screenHeight - safeArea.bottom)
gNavbarH = Math.floor(statusBarHeight + menuButton.height + (menuButton.top - statusBarHeight) * 2)
gStatusBarHeight = statusBarHeight
}
@ -357,6 +358,8 @@ function SpPage (props, ref) {
...pageTheme, ...lockStyle, ...pageBackground, 'padding-top': isTop ? currentPath === 'pages/index' ? 0 : `${customNavigation ? gStatusBarHeight : 0}px` : `${customNavigation ? gNavbarH : 0}px`,
"--nav-height": `${gNavbarH}px`,
"--status-bar-height": `${gStatusBarHeight}px`,
"--area-bottom-height": `${gAreaH}rpx`,
"$page-ipx-footer-height": `${gAreaH}px`,
})}
ref={wrapRef}
>

4
src/pages/category/comps/comp-series.js
View File

@ -160,8 +160,8 @@ const CompSeries = (props) => {
</View>
<SpImage
className={classNames(imgType ? 'cat-img' : 'cat-img-no')}
mode={currentID === '18' ? 'aspectFill' : 'aspectFit'}
height={currentID === '18' ? 350 : windowWidth > 400 ? 278 : 242}
mode={currentID === '18' ? 'aspectFill' : 'widthFix'}
height={currentID === '18' ? 350 : windowWidth > 375 ? 278 : 242}
src={item.img}
/>
</View> : <View

9
src/pages/home/index.scss
View File

@ -68,9 +68,10 @@ page {
display: none;
}
.swiper {
--height: calc(var(--status-bar-height) + #{$tabbar-height} + var(--area-bottom-height));
width: 100%;
height: calc(100vh - #{$page-ipx-footer-height} - var(--status-bar-height));
// height: calc(100vh - #{$tabbar-height});
// height: calc(100vh - #{$page-ipx-footer-height} - var(--status-bar-height));
height: calc(100vh - var(--height));
transition: height 0.3s ease-in-out;
animation: fadeInAnimation 0.35s ease-in;
// &.swiper-narrow {
@ -104,7 +105,9 @@ page {
}
.swiper-narrow {
// height: calc(100vh - 620px - #{$tabbar-height} - var(--status-bar-height));
height: calc(100vh - 420px - #{$tabbar-height} - var(--status-bar-height));
height: calc(
100vh - 386px - #{$tabbar-height} - var(--area-bottom-height) - var(--status-bar-height)
);
transition: height 0.35s linear;
margin-top: -200px;
}

3
src/pages/recommend/list.scss
View File

@ -42,8 +42,9 @@
.active-content {
position: relative;
.swiper {
--height: calc(var(--status-bar-height) + #{$tabbar-height} + var(--area-bottom-height));
width: 100%;
height: calc(100vh - #{$page-ipx-footer-height} - var(--status-bar-height));
height: calc(100vh - var(--height));
transition: height 0.3s ease-in-out;
position: relative;
}

3
src/subpages/marketing/coupon-center.scss
View File

@ -117,7 +117,8 @@
}
&-btn {
padding: 15px 20px;
border: 1px solid #fff;
/* prettier-ignore */
border: 1PX solid #fff;
border-radius: 6px;
display: flex;
justify-content: center;

3
src/subpages/marketing/coupon.scss
View File

@ -70,7 +70,8 @@
}
&-btn {
padding: 15px 20px;
border: 1px solid #fff;
/* prettier-ignore */
border: 1PX solid #fff;
border-radius: 6px;
display: flex;
justify-content: center;

3
src/subpages/pointshop/list.scss
View File

@ -278,7 +278,8 @@
}
&-btn {
padding: 15px 20px;
border: 1px solid #fff;
/* prettier-ignore */
border: 2px solid #fff;
border-radius: 6px;
display: flex;
justify-content: center;