diff --git a/src/components/sp-coupon/index.scss b/src/components/sp-coupon/index.scss index de99cd9..40c3498 100755 --- a/src/components/sp-coupon/index.scss +++ b/src/components/sp-coupon/index.scss @@ -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; diff --git a/src/components/sp-page/index.js b/src/components/sp-page/index.js index 3775a0a..3175f3b 100755 --- a/src/components/sp-page/index.js +++ b/src/components/sp-page/index.js @@ -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} > diff --git a/src/pages/category/comps/comp-series.js b/src/pages/category/comps/comp-series.js index ff503fe..1ffe02d 100755 --- a/src/pages/category/comps/comp-series.js +++ b/src/pages/category/comps/comp-series.js @@ -160,8 +160,8 @@ const CompSeries = (props) => { 400 ? 278 : 242} + mode={currentID === '18' ? 'aspectFill' : 'widthFix'} + height={currentID === '18' ? 350 : windowWidth > 375 ? 278 : 242} src={item.img} /> :