feat: 修改样式

pages/active/super-subsidy/super-subsidy.vue

@@ -1,6 +1,5 @@
 <template>
     <view class="content-two">
-        <TopSafe></TopSafe>
 
         <view class="product_info_header_warp">
             <up-swiper :list="swiperList" class="product_info_header_swiper" @click="onSwiper"
@@ -120,6 +119,7 @@ export default {
             }
             searchList(params).then((res) => {
                 let curPageLen = res.data ? res.data.length : 0;
+                if (page.num === 1) this.dataList = [];
                 if (res.data) {
                     this.dataList = this.dataList.concat(res.data);
                 }
@@ -132,9 +132,7 @@ export default {
         },
 
         downCallback() {
-            this.$nextTick(function () {
-                this.mescroll && this.mescroll.resetUpScroll();
-            });
+            this.mescroll && this.mescroll.resetUpScroll();
         },
 
         mescrollInit(mescroll) {
@@ -175,25 +173,29 @@ export default {
 
 <style lang="scss" scoped>
 .content-two {
-    height: calc(100vh);
+    height: 100vh;
     background-color: #fff;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    position: relative;
 }
 
 .product_info_header_warp {
     position: relative;
 
     .product_info_header_swiper {
-        height: 600rpx !important;
+        height: 660rpx !important;
         border-radius: 0 !important;
 
         ::v-deep(.u-swiper__wrapper) {
-            height: 600rpx !important;
+            height: 660rpx !important;
 
             .u-swiper__wrapper {
-                height: 600rpx !important;
+                height: 660rpx !important;
 
                 .u-swiper__wrapper__item__wrapper__image {
-                    height: 600rpx !important;
+                    height: 660rpx !important;
                     border-radius: 0 !important;
                 }
             }
@@ -279,7 +281,7 @@ export default {
     background-color: #fff;
     overflow-x: auto;
     position: absolute;
-    top: 520rpx;
+    top: 600rpx;
     left: 0;
 
     .tab-list {
@@ -301,9 +303,10 @@ export default {
 }
 
 .setting-view {
-    margin-top: 20rpx;
+    margin-top: 40rpx;
     width: 100%;
-    height: calc(100vh - 88rpx - 80rpx - 100rpx - var(--status-bar-height));
+    flex: 1;
+    min-height: 0;
 
     display: flex;
     flex-direction: column;
@@ -313,9 +316,14 @@ export default {
     box-sizing: border-box;
     position: relative;
 
+    /* #ifndef H5 || MP-WEIXIN */
+    margin-bottom: calc(100rpx + env(safe-area-inset-bottom));
+    /* #endif */
+
     .name-box {
         width: 100%;
-        height: calc(100vh - 88rpx - 80rpx - 100rpx - var(--status-bar-height));
+        flex: 1;
+        min-height: 0;
         display: flex;
         flex-direction: column;
         align-items: center;