From 094c2db3cebf9687b3d4a113cfa5420892741b83 Mon Sep 17 00:00:00 2001 From: "Albert.Z" Date: Tue, 2 May 2023 06:01:18 +0800 Subject: [PATCH] =?UTF-8?q?Update=20=E8=90=A5=E9=94=80=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E4=B8=89=E7=A7=8D=E6=A0=B7=E5=BC=8F=E5=95=86=E5=93=81=E5=8D=A1?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comming-spu-disabled/index.wxss | 1 + .../components/diy-pintuan/index.wxss | 5 +- .../components/guess-like/index.wxss | 4 +- .../components/new-comer/index.wxss | 22 +++--- .../components/new-rush-spu/index.wxss | 2 +- .../components/order/orderInfoExpress.wxss | 8 +-- .../components/orderInfo/index.wxss | 8 +-- .../components/rush-spu-big/index.wxss | 1 + .../components/seckillItem/seckillItem.wxss | 10 +-- .../components/sku/index.wxss | 1 + .../components/topic/topic.wxss | 4 +- .../components/tworow/index.wxss | 2 +- .../moduleA/components/img-box/img-box.wxss | 4 +- .../moduleA/components/menuGoodsItem.wxss | 19 ++--- .../moduleA/components/pinGoods.wxss | 70 ++++++++++--------- .../moduleA/components/rushBig.wxss | 1 + .../moduleA/components/rushNormal.wxss | 1 + .../components/score-guess-like/index.wxss | 2 +- .../moduleB/components/presale-goodsone.wxss | 31 ++++---- .../moduleB/components/presale-goodsrow.wxss | 3 +- .../pages/goods/goodsDetail.wxss | 6 +- .../pages/index/template/pin.wxss | 21 +++--- .../pages/index/template/pinrow.wxss | 7 +- 23 files changed, 136 insertions(+), 97 deletions(-) diff --git a/eaterplanet_ecommerce/components/comming-spu-disabled/index.wxss b/eaterplanet_ecommerce/components/comming-spu-disabled/index.wxss index 9300a07..a888724 100644 --- a/eaterplanet_ecommerce/components/comming-spu-disabled/index.wxss +++ b/eaterplanet_ecommerce/components/comming-spu-disabled/index.wxss @@ -96,6 +96,7 @@ } .comming-spu-content .spu-price .sale-price { + font-family: DIN; color: #ff758c; margin-right: 8rpx; } diff --git a/eaterplanet_ecommerce/components/diy-pintuan/index.wxss b/eaterplanet_ecommerce/components/diy-pintuan/index.wxss index 6d53c08..0152c43 100644 --- a/eaterplanet_ecommerce/components/diy-pintuan/index.wxss +++ b/eaterplanet_ecommerce/components/diy-pintuan/index.wxss @@ -53,7 +53,10 @@ } .pin-spec-item .price { - color: #ff5041; + font-family: DIN; + color: #ff758c; + font-size: 36rpx; + font-weight: bold; } .pin-spec-item .act-end { diff --git a/eaterplanet_ecommerce/components/guess-like/index.wxss b/eaterplanet_ecommerce/components/guess-like/index.wxss index 9bb87cb..e4911b9 100644 --- a/eaterplanet_ecommerce/components/guess-like/index.wxss +++ b/eaterplanet_ecommerce/components/guess-like/index.wxss @@ -62,8 +62,8 @@ } .new-comers-item .price { - font-family: DIN; - color: #ff758c; + font-family: DIN; + color: #ff758c; } .new-comers-item { diff --git a/eaterplanet_ecommerce/components/new-comer/index.wxss b/eaterplanet_ecommerce/components/new-comer/index.wxss index 1175d20..dfd60d6 100644 --- a/eaterplanet_ecommerce/components/new-comer/index.wxss +++ b/eaterplanet_ecommerce/components/new-comer/index.wxss @@ -1,10 +1,9 @@ /* 新人专享 */ .new-comers { position: relative; - padding: 20rpx 0; - margin: 20rpx; - background: #fff; - border-radius: 10rpx; + padding-bottom: 10rpx; + /* margin: 0 20rpx; */ + border-radius: 20rpx; overflow: hidden; z-index: 0; } @@ -23,11 +22,11 @@ left: 0; top: 0; bottom: 0; - border-left: 8rpx solid #4facfe; + border-left: 8rpx solid #ff758c; } .new-comers-scroll { - max-height: 320rpx; + max-height: 340rpx; } .new-comers-wrap { @@ -46,14 +45,16 @@ .new-comers-item .new-img { width: 200rpx; - height: 180rpx; - margin-bottom: 20rpx; + height: 200rpx; + margin-bottom: 10rpx; + border-radius: 20rpx; } .new-comers-item .title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + font-weight: bold; } .new-comers-item .new-bot { @@ -77,7 +78,10 @@ } .new-comers-item .price { - color: #ff758c; + font-family: DIN; + color: #ff758c; + font-size: 36rpx; + font-weight: bold; } .new-comers-item { diff --git a/eaterplanet_ecommerce/components/new-rush-spu/index.wxss b/eaterplanet_ecommerce/components/new-rush-spu/index.wxss index 1ec073e..8f5cdd2 100644 --- a/eaterplanet_ecommerce/components/new-rush-spu/index.wxss +++ b/eaterplanet_ecommerce/components/new-rush-spu/index.wxss @@ -162,7 +162,7 @@ } .spu .spu-content .item-right .spu-price .sale-price { - font-family: 'DIN'; + font-family: DIN; color: #ff758c; margin-right: 14rpx; font-weight: bold; diff --git a/eaterplanet_ecommerce/components/order/orderInfoExpress.wxss b/eaterplanet_ecommerce/components/order/orderInfoExpress.wxss index 76f9409..b2036f0 100644 --- a/eaterplanet_ecommerce/components/order/orderInfoExpress.wxss +++ b/eaterplanet_ecommerce/components/order/orderInfoExpress.wxss @@ -57,8 +57,8 @@ } .footer .money { - font-family: DIN; - color: #ff758c; - font-size: 40rpx; - font-weight: bold; + font-family: DIN; + color: #ff758c; + font-size: 40rpx; + font-weight: bold; } diff --git a/eaterplanet_ecommerce/components/orderInfo/index.wxss b/eaterplanet_ecommerce/components/orderInfo/index.wxss index 8006ca8..fafffcc 100644 --- a/eaterplanet_ecommerce/components/orderInfo/index.wxss +++ b/eaterplanet_ecommerce/components/orderInfo/index.wxss @@ -36,8 +36,8 @@ } .footer .money { - font-family: DIN; - color: #ff758c; - font-weight: bold; - font-size: 40rpx; + font-family: DIN; + color: #ff758c; + font-weight: bold; + font-size: 40rpx; } diff --git a/eaterplanet_ecommerce/components/rush-spu-big/index.wxss b/eaterplanet_ecommerce/components/rush-spu-big/index.wxss index 39e9aef..b09a853 100644 --- a/eaterplanet_ecommerce/components/rush-spu-big/index.wxss +++ b/eaterplanet_ecommerce/components/rush-spu-big/index.wxss @@ -128,6 +128,7 @@ } .spu .spu-content .item-bottom .spu-price .sale-price { + font-family: DIN; color: #ff758c; margin-right: 12rpx; } diff --git a/eaterplanet_ecommerce/components/seckillItem/seckillItem.wxss b/eaterplanet_ecommerce/components/seckillItem/seckillItem.wxss index e956998..412e25a 100644 --- a/eaterplanet_ecommerce/components/seckillItem/seckillItem.wxss +++ b/eaterplanet_ecommerce/components/seckillItem/seckillItem.wxss @@ -7,7 +7,7 @@ .img { width: 240rpx; height: 240rpx; - border-radius: 10rpx; + border-radius: 20rpx; overflow: hidden; } @@ -42,7 +42,7 @@ .seckill-item .item-right .desc { font-size: 26rpx; line-height: 32rpx; - color: #999; + color: #666; width: 400rpx; height: 32rpx; margin-bottom: 12rpx; @@ -61,6 +61,7 @@ } .seckill-item .spu-price .sale-price { + font-family: DIN; color: #ff5344; margin-right: 12rpx; } @@ -73,8 +74,9 @@ } .seckill-item .spu-price .market-price { + font-family: DIN; text-decoration: line-through; - color: #999; + color: #666; margin-right: 30rpx; } @@ -101,7 +103,7 @@ .progress-box { display: flex; - color: #999; + color: #666; font-size: 22rpx; margin-top: auto; margin-bottom: 20rpx; diff --git a/eaterplanet_ecommerce/components/sku/index.wxss b/eaterplanet_ecommerce/components/sku/index.wxss index 54d109f..8713b76 100644 --- a/eaterplanet_ecommerce/components/sku/index.wxss +++ b/eaterplanet_ecommerce/components/sku/index.wxss @@ -85,6 +85,7 @@ } .sku-card .sku-header .sku-price .sale-price { + font-family: DIN; color: #ff758c; margin-right: 12rpx; margin-bottom: -4rpx; diff --git a/eaterplanet_ecommerce/components/topic/topic.wxss b/eaterplanet_ecommerce/components/topic/topic.wxss index 87980cc..42e8cbf 100644 --- a/eaterplanet_ecommerce/components/topic/topic.wxss +++ b/eaterplanet_ecommerce/components/topic/topic.wxss @@ -2,8 +2,8 @@ .topic { margin: 20rpx; - background: #fff; - border-radius: 10rpx; + background: #ffffff86; + border-radius: 20rpx; overflow: hidden; } diff --git a/eaterplanet_ecommerce/components/tworow/index.wxss b/eaterplanet_ecommerce/components/tworow/index.wxss index adaef5d..256a6dd 100644 --- a/eaterplanet_ecommerce/components/tworow/index.wxss +++ b/eaterplanet_ecommerce/components/tworow/index.wxss @@ -104,7 +104,7 @@ } .comming-spu-content .spu-price .sale-price { - font-family: 'DIN'; + font-family: DIN; color: #ff758c; font-weight: bold; margin-right: 8rpx; diff --git a/eaterplanet_ecommerce/moduleA/components/img-box/img-box.wxss b/eaterplanet_ecommerce/moduleA/components/img-box/img-box.wxss index abddae8..6fc5c69 100644 --- a/eaterplanet_ecommerce/moduleA/components/img-box/img-box.wxss +++ b/eaterplanet_ecommerce/moduleA/components/img-box/img-box.wxss @@ -5,9 +5,9 @@ width: 100%; margin-bottom: 20rpx; background: #fff; - border-radius: 10rpx; + border-radius: 20rpx; overflow: hidden; - box-shadow: 0 0 3px #ccc; + box-shadow: 0 0 5px #ccc; } .img-box .img { diff --git a/eaterplanet_ecommerce/moduleA/components/menuGoodsItem.wxss b/eaterplanet_ecommerce/moduleA/components/menuGoodsItem.wxss index 616c6e7..49a1394 100644 --- a/eaterplanet_ecommerce/moduleA/components/menuGoodsItem.wxss +++ b/eaterplanet_ecommerce/moduleA/components/menuGoodsItem.wxss @@ -3,10 +3,10 @@ width: 580rpx; box-sizing: border-box; display: block; - border: .1rpx solid #eee; - border-radius: 10rpx; + border-radius: 20rpx; margin-left: 20rpx; - padding: 20rpx 10rpx; + + box-shadow: 0 0 5px #ccc; } .spu .spu-content { @@ -14,9 +14,9 @@ } .spu .img-class { - width: 160rpx; - height: 160rpx; - border-radius: 10rpx; + width: 170rpx; + height: 170rpx; + border-radius: 20rpx 0 0 20rpx; image-rendering: crisp-edges; margin-right: 20rpx; overflow: hidden; @@ -29,8 +29,8 @@ } .spu-desc { - font-size: 26rpx; - color: #666; + font-size: 20rpx; + color: #888; } .item-bottom { @@ -39,6 +39,7 @@ display: flex; flex-direction: column; justify-content: space-between; + padding: 20rpx 10rpx; } .spu .spu-content .item-bottom .spu-price { @@ -53,6 +54,7 @@ } .spu .spu-content .item-bottom .spu-price .sale-price { + font-family: DIN; color: #ff758c; margin-right: 12rpx; } @@ -66,6 +68,7 @@ .spu .spu-content .item-bottom .spu-price .market-price { text-decoration: line-through; + font-family: DIN; color: #999; margin-right: 20rpx; } diff --git a/eaterplanet_ecommerce/moduleA/components/pinGoods.wxss b/eaterplanet_ecommerce/moduleA/components/pinGoods.wxss index 6e38fc2..5784343 100644 --- a/eaterplanet_ecommerce/moduleA/components/pinGoods.wxss +++ b/eaterplanet_ecommerce/moduleA/components/pinGoods.wxss @@ -1,19 +1,18 @@ .spu-content { - width: 350rpx; - height: 506rpx; - border-radius: 20rpx; - background: #fff; - box-sizing: border-box; - padding: 30rpx 25rpx; - box-shadow: 0 0 40rpx rgba(0, 0, 0, 0.05); - position: relative; - margin-bottom: 10rpx; + width: 345rpx; + border-radius: 20rpx; + background: #fff; + box-sizing: border-box; + box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.2); + position: relative; + margin-bottom: 20rpx; + overflow: hidden; } .spu-img { - width: 300rpx; - height: 300rpx; - border-radius: 10rpx; + width: 345rpx; + height: 345rpx; + border-radius: 20rpx 20rpx 0 0; } .spu-content .spu-title { @@ -28,45 +27,51 @@ } .spu-content .spu-title .span { - display: block; - width: 100%; + + padding: 0 20rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } .spu-content .spu-price { - display: flex; - align-items: flex-end; - font-size: 20rpx; + padding: 0 20rpx; + display: flex; + align-items: flex-end; + font-size: 26rpx; + line-height: 26rpx; + overflow: hidden; + margin-top: 10rpx; + font-family: DIN; } .spu-content .spu-price .sale-price { color: #ff758c; margin-right: 8rpx; + font-weight: bold; } .spu-content .spu-price .sale-price .span { font-size: 40rpx; line-height: 40rpx; margin-left: 4rpx; - font-weight: 500; } .spu-content .spu-price .market-price { text-decoration: line-through; - color: #999; + color: #666; } .spu-content .spu-count { display: flex; align-items: flex-end; - font-size: 20rpx; - color: #999; - margin-top: 10rpx; + color: #666; + margin: 10rpx 0; + font-size: 24rpx; + padding: 0 20rpx 20rpx; } -.spu-content .add-cart,.spu .spu-content .add-cart-disabled { +.spu-content .add-cart, .spu-content .add-cart-disabled { width: 100rpx; height: 50rpx; padding: 0; @@ -79,9 +84,9 @@ justify-content: center; background: linear-gradient(100deg,#4facfe 0%,#00f2fe 100%); color: #fff; - border-radius: 25rpx; + border-radius: 30rpx; font-size: 26rpx; - font-weight: bold; + line-height: 26rpx; } .spu-content .add-cart-disabled { @@ -97,7 +102,7 @@ line-height: 1; vertical-align: middle; color: #ff5344; - border-radius: 4rpx; + border-radius: 5rpx; } .spu-play { @@ -115,12 +120,13 @@ } .mask { - background: rgba(255, 255, 255, 0.5); - width: 300rpx; - height: 240rpx; - position: absolute; - left: 25rpx; - top: 30rpx; + background: rgba(255, 255, 255, 0.5); + width: 345rpx; + height: 345rpx; + position: absolute; + border-radius: 20rpx 20rpx 0 0; + left: 0; + top: 0; } .act-end { diff --git a/eaterplanet_ecommerce/moduleA/components/rushBig.wxss b/eaterplanet_ecommerce/moduleA/components/rushBig.wxss index a37de5e..367d984 100644 --- a/eaterplanet_ecommerce/moduleA/components/rushBig.wxss +++ b/eaterplanet_ecommerce/moduleA/components/rushBig.wxss @@ -123,6 +123,7 @@ } .spu-content .item-bottom .spu-price .sale-price { + font-family: DIN; color: #ff758c; margin-right: 12rpx; } diff --git a/eaterplanet_ecommerce/moduleA/components/rushNormal.wxss b/eaterplanet_ecommerce/moduleA/components/rushNormal.wxss index b697b84..b831a47 100644 --- a/eaterplanet_ecommerce/moduleA/components/rushNormal.wxss +++ b/eaterplanet_ecommerce/moduleA/components/rushNormal.wxss @@ -120,6 +120,7 @@ } .spu-content .item-bottom .spu-price .sale-price { + font-family: DIN; color: #ff758c; margin-right: 12rpx; } diff --git a/eaterplanet_ecommerce/moduleA/components/score-guess-like/index.wxss b/eaterplanet_ecommerce/moduleA/components/score-guess-like/index.wxss index 515c596..6322ba6 100644 --- a/eaterplanet_ecommerce/moduleA/components/score-guess-like/index.wxss +++ b/eaterplanet_ecommerce/moduleA/components/score-guess-like/index.wxss @@ -59,7 +59,7 @@ display: flex; align-items: center; justify-content: center; - background: #ff5344; + background: #ff7eb3; color: #fff; border-radius: 30rpx; font-size: 24rpx; diff --git a/eaterplanet_ecommerce/moduleB/components/presale-goodsone.wxss b/eaterplanet_ecommerce/moduleB/components/presale-goodsone.wxss index 29ab264..ac2601f 100644 --- a/eaterplanet_ecommerce/moduleB/components/presale-goodsone.wxss +++ b/eaterplanet_ecommerce/moduleB/components/presale-goodsone.wxss @@ -1,19 +1,23 @@ .spu-content { - width: 350rpx; + width: 345rpx; height: 600rpx; border-radius: 20rpx; background: #fff; box-sizing: border-box; - padding: 30rpx 25rpx; - box-shadow: 0 0 40rpx rgba(0, 0, 0, 0.05); + box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.2); position: relative; - margin-bottom: 10rpx; + margin-bottom: 20rpx; + overflow: hidden; +} + +.spu-content .item-bottom { + padding: 0 20rpx; } .spu-img { - width: 300rpx; - height: 300rpx; - border-radius: 10rpx; + width: 345rpx; + height: 345rpx; + border-radius: 20rpx 20rpx 0 0; } .spu-content .spu-title { @@ -38,8 +42,8 @@ .spu-content .spu-price { display: flex; align-items: flex-end; - font-size: 20rpx; - margin-top: 30rpx; + font-size: 28rpx; + margin-top: 10rpx; } .spu-content .spu-price .sale-price { @@ -113,11 +117,12 @@ .mask { background: rgba(255, 255, 255, 0.5); - width: 300rpx; - height: 300rpx; + width: 345rpx; + height: 345rpx; position: absolute; - left: 25rpx; - top: 30rpx; + border-radius: 20rpx 20rpx 0 0; + left: 0; + top: 0; } .act-end { diff --git a/eaterplanet_ecommerce/moduleB/components/presale-goodsrow.wxss b/eaterplanet_ecommerce/moduleB/components/presale-goodsrow.wxss index fa6daa6..93d2a82 100644 --- a/eaterplanet_ecommerce/moduleB/components/presale-goodsrow.wxss +++ b/eaterplanet_ecommerce/moduleB/components/presale-goodsrow.wxss @@ -3,7 +3,8 @@ .pinrow-wrap { background: #ffffff; - border-radius: 10rpx; + border-radius: 20rpx; + width: 710rpx; } .pinrow-wrap .spu-content { diff --git a/eaterplanet_ecommerce/pages/goods/goodsDetail.wxss b/eaterplanet_ecommerce/pages/goods/goodsDetail.wxss index 47bc45d..bcc5ae9 100644 --- a/eaterplanet_ecommerce/pages/goods/goodsDetail.wxss +++ b/eaterplanet_ecommerce/pages/goods/goodsDetail.wxss @@ -402,8 +402,8 @@ movable-area { .spuInfo .straightInLive .preferential .tit, .spuInfo .buyRecords .preferential .tit { font-size: 20rpx; - color: #4facfe; - border: 2rpx solid #00f2fe; + color: #ca7e57; + border: 2rpx solid #ca7e57; border-radius: 16rpx; padding: 0 8rpx; margin-right: 10rpx; @@ -967,6 +967,7 @@ button::after { .goods-bottom-bar .leftBtn .back-to-index image { width: 50rpx; height: 50rpx; + padding-bottom: 3rpx; } .goods-bottom-bar .leftBtn .shop-cart { @@ -984,6 +985,7 @@ button::after { width: 50rpx; height: 50rpx; position: relative; + padding-bottom: 3rpx; } .goods-bottom-bar .leftBtn .shop-cart .icon image { diff --git a/eaterplanet_ecommerce/pages/index/template/pin.wxss b/eaterplanet_ecommerce/pages/index/template/pin.wxss index 65424ed..25f5824 100644 --- a/eaterplanet_ecommerce/pages/index/template/pin.wxss +++ b/eaterplanet_ecommerce/pages/index/template/pin.wxss @@ -1,7 +1,7 @@ .pin-spec { position: relative; - background: #fff; - margin: 20rpx; + background: #ffffff86; + margin: 0 20rpx 20rpx; border-radius: 20rpx; overflow: hidden; } @@ -25,22 +25,24 @@ .pin-spec-item { position: relative; - width: 240rpx; + width: 226rpx; box-sizing: border-box; padding: 20rpx; font-size: 28rpx; } .pin-spec-item .pin-img { - width: 200rpx; - height: 200rpx; - margin-bottom: 20rpx; + width: 186rpx; + height: 186rpx; + border-radius: 20rpx; + margin-bottom: 10rpx; } .pin-spec-item .title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + font-weight: bold; } .pin-spec-item .new-bot { @@ -50,7 +52,10 @@ } .pin-spec-item .price { - color: #ff5041; + font-family: DIN; + color: #ff758c; + font-size: 36rpx; + font-weight: bold; } .pin-spec-item .act-end { @@ -83,7 +88,7 @@ border: 0.1rpx solid #ff758c; vertical-align: middle; color: #ff758c; - border-radius: 4rpx; + border-radius: 5rpx; } /* 标签 */ diff --git a/eaterplanet_ecommerce/pages/index/template/pinrow.wxss b/eaterplanet_ecommerce/pages/index/template/pinrow.wxss index 3ae6877..dc5af3a 100644 --- a/eaterplanet_ecommerce/pages/index/template/pinrow.wxss +++ b/eaterplanet_ecommerce/pages/index/template/pinrow.wxss @@ -6,6 +6,9 @@ box-sizing: border-box; position: relative; display: flex; + box-shadow: 0 0 20rpx rgba(0, 0, 0, .2); + border-radius: 20rpx; + overflow: hidden; } .pinrow-wrap .spu-img { @@ -82,7 +85,7 @@ } .pinrow-wrap .spu-content .spu-price .sale-price { - font-family: 'DIN'; + font-family: DIN; color: #ff758c; margin-right: 12rpx; } @@ -116,7 +119,7 @@ border: 0.1rpx solid #ff5344; vertical-align: middle; color: #ff5344; - border-radius: 4rpx; + border-radius: 6rpx; } .pinrow-wrap .spu-content .add-cart,