From d57ca12b1a336a9b8ce1f6fa8c1b65bdb5c2ab29 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Sun, 8 Oct 2023 10:00:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/binding-list/binding-list.vue | 2 +- components/coupon-card/coupon-card.vue | 2 +- components/slider/slider.vue | 284 +++++++++--------- pages.json | 9 + pages/index/index.css | 168 +++++------ pages/index/index.vue | 10 +- pages/plugins/binding/detail/detail.css | 13 +- pages/plugins/binding/detail/detail.vue | 28 +- pages/plugins/coupon/index/index.css | 43 ++- pages/plugins/coupon/index/index.vue | 34 ++- .../membershiplevelvip/index/index.vue | 41 ++- pages/plugins/realstore/detail/detail.vue | 2 +- pages/plugins/shop/index/index.css | 3 + pages/plugins/shop/index/index.vue | 85 +++--- .../signin/index-detail/index-detail.css | 2 +- .../signin/index-detail/index-detail.vue | 23 ++ .../user-answers-detail.vue | 2 +- 17 files changed, 429 insertions(+), 322 deletions(-) diff --git a/components/binding-list/binding-list.vue b/components/binding-list/binding-list.vue index 2614dfbc..b060e603 100644 --- a/components/binding-list/binding-list.vue +++ b/components/binding-list/binding-list.vue @@ -123,7 +123,7 @@ .plugins-binding-data-list .item .buy-submit { padding: 0 20rpx; height: 46rpx; - line-height: 46rpx; + line-height: 44rpx; } .plugins-binding-data-list .item .binding-goods-list { background: #f8f8f8; diff --git a/components/coupon-card/coupon-card.vue b/components/coupon-card/coupon-card.vue index 76c0f2ab..2310e054 100644 --- a/components/coupon-card/coupon-card.vue +++ b/components/coupon-card/coupon-card.vue @@ -119,7 +119,7 @@ }, data() { return { - coupon_static_url: coupon_static_url, + coupon_static_url: coupon_static_url + 'app/', // 符号 currency_symbol: app.globalData.data.currency_symbol, // 首页地址 diff --git a/components/slider/slider.vue b/components/slider/slider.vue index 6de4290a..bdb5ddb2 100644 --- a/components/slider/slider.vue +++ b/components/slider/slider.vue @@ -1,157 +1,155 @@ \ No newline at end of file + .swiper-right /deep/ .uni-swiper__dots-box { + justify-content: end; + padding-right: 24rpx; + } + diff --git a/pages.json b/pages.json index badf2ad9..6508edb4 100644 --- a/pages.json +++ b/pages.json @@ -311,6 +311,9 @@ "pages": [{ "path": "index/index", "style": { + // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP + "navigationStyle": "custom", + // #endif "enablePullDownRefresh": true, "navigationBarTitleText": "领券中心" } @@ -336,6 +339,9 @@ "pages": [{ "path": "index/index", "style": { + // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP + "navigationStyle": "custom", + // #endif "enablePullDownRefresh": true, "navigationBarTitleText": "会员VIP" } @@ -688,6 +694,9 @@ { "path": "index-detail/index-detail", "style": { + // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP + "navigationStyle": "custom", + // #endif "enablePullDownRefresh": true, "navigationBarTitleText": "签到" } diff --git a/pages/index/index.css b/pages/index/index.css index 951254ba..edafc78c 100644 --- a/pages/index/index.css +++ b/pages/index/index.css @@ -2,35 +2,35 @@ * 顶部内容 */ .home-top-nav-content { - background-repeat: no-repeat; - background-size: 100% auto; - min-height: calc(var(--status-bar-height) + 130rpx); - /* #ifdef H5 */ - min-height: calc(var(--status-bar-height) + 160rpx); - /* #endif */ - padding-top: calc(var(--status-bar-height) + 8px); + background-repeat: no-repeat; + background-size: 100% auto; + min-height: calc(var(--status-bar-height) + 130rpx); + /* #ifdef H5 */ + min-height: calc(var(--status-bar-height) + 160rpx); + /* #endif */ + padding-top: calc(var(--status-bar-height) + 5px); } .home-top-nav-logo { - text-align: left; - padding: 2px 250rpx 10rpx 20rpx; - height: 37px; - /* #ifdef H5 || MP-TOUTIAO || APP */ - padding-top: 0; - /* #endif */ + text-align: left; + padding: 2px 250rpx 10rpx 20rpx; + height: 37px; + /* #ifdef H5 || MP-TOUTIAO || APP */ + padding-top: 0; + /* #endif */ } .home-top-nav-logo-image { - width: 240rpx; - height: 100% !important; + width: 240rpx; + height: 100% !important; } .home-top-nav-logo-title { - font-weight: bold; - font-size: 42rpx; - /* #ifdef H5 || MP-TOUTIAO || APP */ - font-size: 24px; - /* #endif */ + font-weight: bold; + font-size: 42rpx; + /* #ifdef H5 || MP-TOUTIAO || APP */ + font-size: 24px; + /* #endif */ } /** @@ -38,22 +38,22 @@ */ /* #ifdef H5 || MP-TOUTIAO || APP */ .nav-top-right-icon { - top: -34px; - right: 28rpx; - z-index: 12; - line-height: 28px; - /* #ifdef MP-TOUTIAO */ - top: 2px; - /* #endif */ + top: -34px; + right: 28rpx; + z-index: 12; + line-height: 28px; + /* #ifdef MP-TOUTIAO */ + top: 2px; + /* #endif */ } .nav-top-right-icon .item:not(:last-child) { - margin-right: 20rpx; + margin-right: 20rpx; } .nav-top-right-icon .badge-icon { - top: -10px; - right: 2px; + top: -10px; + right: 2px; } /* #endif */ @@ -62,30 +62,30 @@ * 搜索 */ .search-fixed-seat { - padding-top: 70rpx; - /* #ifdef MP-TOUTIAO */ - padding-top: 60rpx; - /* #endif */ + padding-top: 70rpx; + /* #ifdef MP-TOUTIAO */ + padding-top: 60rpx; + /* #endif */ } .search-content-fixed { - position: fixed !important; - top: 0; - z-index: 11; - padding-bottom: 20rpx; - width: 100%; - background-repeat: no-repeat; - background-size: 100% auto; - padding-top: 25px; - /* #ifdef H5 || APP */ - padding-top: 15rpx !important; - padding-bottom: 15rpx !important; - /* #endif */ + position: fixed !important; + top: 0; + z-index: 11; + padding-bottom: 20rpx; + width: 100%; + background-repeat: no-repeat; + background-size: 100% auto; + padding-top: 25px; + /* #ifdef H5 || APP */ + padding-top: 15rpx !important; + padding-bottom: 15rpx !important; + /* #endif */ } /* #ifdef H5 || MP-TOUTIAO || APP */ .search-content-fixed .nav-top-right-icon { - top: 9px !important; + top: 9px !important; } /* #endif */ @@ -94,23 +94,23 @@ * 轮播 */ .banner-content { - margin-top: 26rpx; + margin-top: 26rpx; } /** * 推荐文章 */ .article-list .new-icon { - width: 130rpx !important; - height: 42rpx !important; + width: 130rpx !important; + height: 42rpx !important; } .article-list .right-content { - width: calc(100% - 150rpx); + width: calc(100% - 150rpx); } .article-list .right-content swiper { - height: 40rpx; + height: 40rpx; } /* @@ -118,55 +118,55 @@ */ .plugins-seckill-data { - background-size: 100% auto; - background-repeat: no-repeat; - background-position: top; - background-color: #fff; + background-size: 100% auto; + background-repeat: no-repeat; + background-position: top; + background-color: #fff; } .plugins-seckill-data .icon { - max-width: 140rpx; - max-height: 34rpx; + max-width: 140rpx; + max-height: 34rpx; } .plugins-seckill-data .goods-list .swiper { - height: 310rpx !important; + height: 310rpx !important; } .plugins-seckill-data .goods-list .item .goods-img { - width: 100%; - height: 210rpx; + width: 100%; + height: 210rpx; } .plugins-seckill-data .goods-list .goods-base .icon { - right: 20rpx; - bottom: 13rpx; + right: 20rpx; + bottom: 13rpx; } /** * 购买记录 - 插件 */ .plugins-salerecords swiper { - height: 506rpx; + height: 506rpx; } .plugins-salerecords image { - width: 40rpx !important; - height: 40rpx !important; - border-radius: 50%; + width: 40rpx !important; + height: 40rpx !important; + border-radius: 50%; } .plugins-salerecords .item-content { - width: 24%; + width: 24%; } .plugins-salerecords .item-content:nth-child(1) { - width: 36%; + width: 36%; } .plugins-salerecords .item-content:nth-child(2) { - width: 40%; + width: 40%; } /** @@ -175,45 +175,45 @@ .plugins-seckill-data .plugins-label-bottom-left, .plugins-seckill-data .plugins-label-bottom-center, .plugins-seckill-data .plugins-label-bottom-right { - bottom: calc(100% - 240rpx); + bottom: calc(100% - 240rpx); } /** * 首页中间广告- 插件 */ .plugins-homemiddleadv .item { - width: calc(50% - 10rpx); + width: calc(50% - 10rpx); } .plugins-homemiddleadv .item:nth-of-type(2n + 1) { - float: left; + float: left; } .plugins-homemiddleadv .item:nth-of-type(2n) { - float: right; + float: right; } /** * 弹屏广告 - 插件 */ .plugins-popupscreen { - position: fixed; - left: 0; - top: 0; - z-index: 20; - background-color: rgb(0 0 0 / 0.7); + position: fixed; + left: 0; + top: 0; + z-index: 20; + background-color: rgb(0 0 0 / 0.7); } .plugins-popupscreen .close { - right: 10%; - top: 0; - z-index: 1; + right: 10%; + top: 0; + z-index: 1; } .plugins-popupscreen .content { - margin-top: calc(50vh - 200rpx) !important; + margin-top: calc(50vh - 200rpx) !important; } .plugins-popupscreen .content image { - width: 600rpx; + width: 600rpx; } \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index e9cc5f88..7fa8d384 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -336,7 +336,7 @@ application_logo: app.globalData.data.application_logo, is_logo_use_text: app.globalData.data.is_logo_use_text || 0, // 顶部+搜索样式配置 - top_content_style: 'padding-top:' + (bar_height + 8) + 'px;background:linear-gradient(180deg, ' + theme_color + ' 0%, #f5f5f5 80%)', + top_content_style: 'padding-top:' + (bar_height + 5) + 'px;background:linear-gradient(180deg, ' + theme_color + ' 0%, #f5f5f5 80%)', top_content_title_style: 'background-image: url("' + static_url + 'nav-top.png");' + 'padding-top:' + (bar_height + 5) + 'px;background-color:' + theme_color, search_style: '', search_is_fixed: 0, @@ -485,9 +485,9 @@ // 轮播数据处理 if (data.banner_list && data.banner_list.length > 0) { if (data.banner_list[0].bg_color) { - this.slider_bg = 'background: linear-gradient(180deg, ' + data.banner_list[0].bg_color + ' 0%, #f5f5f5 80%);padding-top:' + (bar_height + 8) + 'px;'; + this.slider_bg = 'background: linear-gradient(180deg, ' + data.banner_list[0].bg_color + ' 0%, #f5f5f5 80%);padding-top:' + (bar_height + 5) + 'px;'; } else { - this.slider_bg = 'background: linear-gradient(180deg, ' + this.theme_color + ' 0%, #f5f5f5 80%);padding-top:' + (bar_height + 8) + 'px;'; + this.slider_bg = 'background: linear-gradient(180deg, ' + this.theme_color + ' 0%, #f5f5f5 80%);padding-top:' + (bar_height + 5) + 'px;'; } } @@ -614,9 +614,9 @@ // 轮播改变 changeBanner(color) { if (color) { - this.slider_bg = 'background: linear-gradient(180deg,' + color + ' 0%, #f5f5f5 80%);padding-top:' + (bar_height + 8) + 'px;'; + this.slider_bg = 'background: linear-gradient(180deg,' + color + ' 0%, #f5f5f5 80%);padding-top:' + (bar_height + 5) + 'px;'; } else { - this.slider_bg = 'background: linear-gradient(180deg, ' + this.theme_color + ' 0%, #f5f5f5 80%);padding-top:' + (bar_height + 8) + 'px;'; + this.slider_bg = 'background: linear-gradient(180deg, ' + this.theme_color + ' 0%, #f5f5f5 80%);padding-top:' + (bar_height + 5) + 'px;'; } }, }, diff --git a/pages/plugins/binding/detail/detail.css b/pages/plugins/binding/detail/detail.css index 1f42e8df..535cc8c4 100644 --- a/pages/plugins/binding/detail/detail.css +++ b/pages/plugins/binding/detail/detail.css @@ -55,13 +55,12 @@ } .nav-button .right-button { - width: 250rpx; + width: 240rpx; } -.nav-button .left-price .estimate-discount-price { - top: 6rpx; - left: 20rpx; - width: calc(100% - 270rpx); +.nav-button .right-button button { + height: 80rpx; + line-height: 78rpx; } .nav-button .left-price .discount-icon { @@ -73,6 +72,10 @@ padding: 0 16rpx; } +.sales-price .price { + font-size: 40rpx; +} + @keyframes gradient { 0% { background-position: 0% 50%; diff --git a/pages/plugins/binding/detail/detail.vue b/pages/plugins/binding/detail/detail.vue index ad6dc7df..343cc30f 100644 --- a/pages/plugins/binding/detail/detail.vue +++ b/pages/plugins/binding/detail/detail.vue @@ -59,16 +59,28 @@ - - - - 节省 - {{ currency_symbol }}{{ data.estimate_discount_price }} + + + + + {{ currency_symbol }} + + + {{ data.estimate_price }} + + + + 节省 + + + {{ currency_symbol }} + + {{ data.estimate_discount_price }} + - {{ currency_symbol }}{{ data.estimate_price }} - - + + diff --git a/pages/plugins/coupon/index/index.css b/pages/plugins/coupon/index/index.css index 3666d21b..7b250e78 100644 --- a/pages/plugins/coupon/index/index.css +++ b/pages/plugins/coupon/index/index.css @@ -2,31 +2,44 @@ * 领券中心 */ .plugins-coupon-container { - padding-top: 270rpx; - height: calc(100vh - 456rpx); + padding-top: 408rpx; + height: calc(100vh - 500rpx - var(--status-bar-height) - 5px); + /* #ifdef H5 */ + padding-top: 408rpx; + height: calc(100vh - 560rpx); + /* #endif */ } .coupon-content { - padding-bottom: 186rpx; - border-top: 42rpx solid #fff; - border-radius: 32rpx 32rpx 0 0; - height: calc(100% - 42rpx); + padding-bottom: 148rpx; + border-top: 42rpx solid #fff; + border-radius: 32rpx 32rpx 0 0; + min-height: calc(100% - 42rpx); } .coupon-content .item { - padding: 0 24rpx 24rpx 24rpx; + padding: 0 24rpx 24rpx 24rpx; } .popup-bottom { - box-shadow: inset 0px 1px 3px 0px rgba(0, 0, 0, 0.08); - z-index: 2; + box-shadow: inset 0px 1px 3px 0px rgba(0, 0, 0, 0.08); + z-index: 2; } .popup-btn { - border: 2rpx solid #FF6E01; - color: #FF6E01; - border-radius: 22px; - font-size: 32rpx; - padding: 20rpx 0; - margin: 30rpx 90rpx 68rpx 90rpx; + border: 2rpx solid #FF6E01; + color: #FF6E01; + border-radius: 22px; + font-size: 32rpx; + padding: 20rpx 0; + margin: 30rpx 90rpx 30rpx 90rpx; +} + +@media screen and (min-width: 960px) { + .plugins-coupon-container { + /* #ifdef H5 */ + padding-top: 450px; + height: calc(100vh - 525px); + /* #endif */ + } } \ No newline at end of file diff --git a/pages/plugins/coupon/index/index.vue b/pages/plugins/coupon/index/index.vue index a9fad9e7..9cde9292 100644 --- a/pages/plugins/coupon/index/index.vue +++ b/pages/plugins/coupon/index/index.vue @@ -1,10 +1,17 @@ \ No newline at end of file + diff --git a/pages/plugins/signin/index-detail/index-detail.css b/pages/plugins/signin/index-detail/index-detail.css index 84558425..ee328348 100644 --- a/pages/plugins/signin/index-detail/index-detail.css +++ b/pages/plugins/signin/index-detail/index-detail.css @@ -10,7 +10,7 @@ } .signin-opration-group { - top: 60rpx; + top: 156rpx; } .share, diff --git a/pages/plugins/signin/index-detail/index-detail.vue b/pages/plugins/signin/index-detail/index-detail.vue index 25260ab7..98c8cf94 100644 --- a/pages/plugins/signin/index-detail/index-detail.vue +++ b/pages/plugins/signin/index-detail/index-detail.vue @@ -1,6 +1,13 @@