diff --git a/common.scss b/common.scss index 69392de..5ff813f 100644 --- a/common.scss +++ b/common.scss @@ -67,6 +67,7 @@ border-radius: 30rpx; padding: 30rpx; margin-bottom: 30rpx; + } .data_msg { diff --git a/components/choiceness/choiceness.vue b/components/choiceness/choiceness.vue index 3ff9438..11d644e 100644 --- a/components/choiceness/choiceness.vue +++ b/components/choiceness/choiceness.vue @@ -1,43 +1,20 @@ @@ -238,14 +224,18 @@ export default { .content-two { height: 100vh; background-color: #fff; - display: flex; - flex-direction: column; - overflow: hidden; position: relative; + overflow: hidden; } .product_info_header_warp { - position: relative; + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 660rpx; + z-index: 10; + background-color: #fff; .product_info_header_swiper { height: 660rpx !important; @@ -379,9 +369,10 @@ export default { box-sizing: border-box; background-color: #fff; overflow-x: auto; - position: absolute; + position: fixed; top: 600rpx; left: 0; + z-index: 11; .tab-list-container { width: 100%; @@ -406,28 +397,14 @@ export default { } .setting-view { - margin-top: 0; width: 100%; - flex: 1; - min-height: 0; - - display: flex; - flex-direction: column; - align-items: center; - overflow-y: auto; - padding: 0 32rpx; + padding: 0 32rpx 20rpx; box-sizing: border-box; position: relative; - margin-top: 126rpx; - - /* #ifndef H5 || MP-WEIXIN */ - margin-bottom: calc(100rpx + env(safe-area-inset-bottom)); - /* #endif */ + margin-top: 0; .name-box { width: 100%; - flex: 1; - min-height: 0; display: flex; flex-direction: column; align-items: center; diff --git a/pages/active/newcomer-exclusive/newcomer-exclusive.vue b/pages/active/newcomer-exclusive/newcomer-exclusive.vue index 4737324..601b27b 100644 --- a/pages/active/newcomer-exclusive/newcomer-exclusive.vue +++ b/pages/active/newcomer-exclusive/newcomer-exclusive.vue @@ -17,26 +17,25 @@ - - - {{ item.name }} - + + + + {{ item.name }} + + - - - - - - - + + + + - + - + @@ -193,14 +192,18 @@ export default { .content-two { height: 100vh; background-color: #fff; - display: flex; - flex-direction: column; - overflow: hidden; position: relative; + overflow: hidden; } .product_info_header_warp { - position: relative; + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 660rpx; + z-index: 10; + background-color: #fff; .product_info_header_swiper { height: 660rpx !important; @@ -323,25 +326,12 @@ export default { .setting-view { margin-top: 40rpx; width: 100%; - flex: 1; - min-height: 0; - - display: flex; - flex-direction: column; - align-items: center; - overflow-y: auto; - padding: 0 32rpx; + padding: 0 32rpx 20rpx; box-sizing: border-box; position: relative; - /* #ifndef H5 || MP-WEIXIN */ - margin-bottom: calc(100rpx + env(safe-area-inset-bottom)); - /* #endif */ - .name-box { width: 100%; - flex: 1; - min-height: 0; display: flex; flex-direction: column; align-items: center; diff --git a/pages/active/super-subsidy/super-subsidy.vue b/pages/active/super-subsidy/super-subsidy.vue index a9449e2..8140ed0 100644 --- a/pages/active/super-subsidy/super-subsidy.vue +++ b/pages/active/super-subsidy/super-subsidy.vue @@ -17,29 +17,16 @@ - - - - - - - - + + + + + - + - - - - + @@ -175,14 +162,18 @@ export default { .content-two { height: 100vh; background-color: #fff; - display: flex; - flex-direction: column; - overflow: hidden; position: relative; + overflow: hidden; } .product_info_header_warp { - position: relative; + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 660rpx; + z-index: 10; + background-color: #fff; .product_info_header_swiper { height: 660rpx !important; @@ -305,25 +296,12 @@ export default { .setting-view { margin-top: 40rpx; width: 100%; - flex: 1; - min-height: 0; - - display: flex; - flex-direction: column; - align-items: center; - overflow-y: auto; - padding: 0 32rpx; + padding: 0 32rpx 20rpx; box-sizing: border-box; position: relative; - /* #ifndef H5 || MP-WEIXIN */ - margin-bottom: calc(100rpx + env(safe-area-inset-bottom)); - /* #endif */ - .name-box { width: 100%; - flex: 1; - min-height: 0; display: flex; flex-direction: column; align-items: center; diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index f352c55..571ed57 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -1,6 +1,6 @@