update

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;

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

src/pages/category/comps/comp-series.js

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

src/pages/home/index.scss

@@ -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 - #{$page-ipx-footer-height} - var(--status-bar-height));
-        // height: calc(100vh - #{$tabbar-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;
       }

src/pages/recommend/list.scss

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

src/subpages/marketing/coupon-center.scss

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

src/subpages/marketing/coupon.scss

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

src/subpages/pointshop/list.scss

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