From 9a9276fc9408ef12782d20b7ae736477e1e944e5 Mon Sep 17 00:00:00 2001 From: Niujiawei Date: Thu, 6 Aug 2020 21:35:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F2020.08?= =?UTF-8?q?.06?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/shop/seckill/index.vue | 1 + components/shop/seckill/item.vue | 3 ++- pageA/pactList/pactList.vue | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/components/shop/seckill/index.vue b/components/shop/seckill/index.vue index d80891d..09ea42f 100644 --- a/components/shop/seckill/index.vue +++ b/components/shop/seckill/index.vue @@ -49,6 +49,7 @@ export default { padding: 30rpx; margin-bottom: 20rpx; .top{ + margin-bottom: 20rpx; height: 60rpx; display: flex; align-items: center; diff --git a/components/shop/seckill/item.vue b/components/shop/seckill/item.vue index efebd34..b3ca88c 100644 --- a/components/shop/seckill/item.vue +++ b/components/shop/seckill/item.vue @@ -58,7 +58,7 @@ export default { width: 220rpx; .head{ width: 210rpx; - height: 131rpx; + height: 151rpx; border-radius: 6rpx; background-color: antiquewhite; } @@ -66,6 +66,7 @@ export default { font-size: 26rpx; color: #333; margin-top: 16rpx; + line-height: 40rpx; } .price{ display: flex; diff --git a/pageA/pactList/pactList.vue b/pageA/pactList/pactList.vue index b126320..e7172f0 100644 --- a/pageA/pactList/pactList.vue +++ b/pageA/pactList/pactList.vue @@ -65,11 +65,11 @@ export default { width: 90%; margin: 0 auto; padding: 16upx 0; - font-size: 26upx; + font-size: 30upx; color: #333; } .rict_type { text-indent: 1rem; - line-height: 1.2; + line-height: 1.4; } From 21d3201c4bd5bcd52061eaccc1a5b72808b7df75 Mon Sep 17 00:00:00 2001 From: Niujiawei Date: Tue, 11 Aug 2020 21:18:34 +0800 Subject: [PATCH 2/3] 2020.08.10 --- components/mine/order-item/index.vue | 17 ++++++++++++++--- components/remaining/remaining.vue | 2 +- pageB/sdetails/index.vue | 16 +++++++++++++++- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue index cf260cb..a2df1c6 100644 --- a/components/mine/order-item/index.vue +++ b/components/mine/order-item/index.vue @@ -13,7 +13,7 @@ {{ goods.goods_name }} - {{ spec + ';' }} + {{ spec + ';' }} 结束时间：{{ order.end_time | date('yyyy-mm-dd hh:MM') }} 总价：￥{{ goods.goods_price }}，实付款￥{{ goods.goods_pay_price }} @@ -173,11 +173,22 @@ export default { .goods-sku { display: inline-block; max-width: 230rpx; - background: rgba(236,236,236,1); + // background: rgba(236,236,236,1); border-radius: 6rpx; - padding: 10rpx 15rpx; + // padding: 10rpx 15rpx; font-size: 24rpx; color: rgba(153,153,153,1); + .goods-sku-text:first-child{ + padding: 10rpx 4rpx 10rpx 15rpx; + } + .goods-sku-text{ + background: rgba(236,236,236,1); + padding: 10rpx 4rpx 10rpx 4rpx; + display: inline-block; + } + .goods-sku-text:last-child{ + padding: 10rpx 15rpx 10rpx 4rpx; + } } .goods-time { font-size: 24rpx; diff --git a/components/remaining/remaining.vue b/components/remaining/remaining.vue index 612bd66..2b8dfec 100644 --- a/components/remaining/remaining.vue +++ b/components/remaining/remaining.vue @@ -311,7 +311,7 @@ color: rgba(51, 51, 51, 1); display: block; text-align: left; - margin: 80rpx auto 33rpx; + margin: 33rpx auto 33rpx; letter-spacing: 1rpx; text-align: justify; line-height: 36rpx; diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue index 1edd690..bc56f3d 100644 --- a/pageB/sdetails/index.vue +++ b/pageB/sdetails/index.vue @@ -115,6 +115,7 @@ + @@ -949,9 +950,22 @@ export default { } } .spec-popup { - padding: 30rpx; + padding:30rpx; box-sizing: border-box; max-height: 750rpx; + .button{ + height: 30rpx; + position: fixed; + left: 0; + top: 0; + width: 100%; + z-index: 999; + background: #fff; + border: none !important; + &::after{ + border: none !important; + } + } .head{ display: flex; margin-bottom: 30rpx; From 23b2b11bc83cf1622618a31991906140f03ec495 Mon Sep 17 00:00:00 2001 From: Niujiawei Date: Tue, 11 Aug 2020 21:47:28 +0800 Subject: [PATCH 3/3] 2020.08.10 --- components/mine/order-item/index.vue | 3 ++- pageB/photo/index.vue | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue index a2df1c6..3c309d9 100644 --- a/components/mine/order-item/index.vue +++ b/components/mine/order-item/index.vue @@ -172,7 +172,7 @@ export default { } .goods-sku { display: inline-block; - max-width: 230rpx; + // max-width: 230rpx; // background: rgba(236,236,236,1); border-radius: 6rpx; // padding: 10rpx 15rpx; @@ -188,6 +188,7 @@ export default { } .goods-sku-text:last-child{ padding: 10rpx 15rpx 10rpx 4rpx; + border-radius:0 6rpx 6rpx 0; } } .goods-time { diff --git a/pageB/photo/index.vue b/pageB/photo/index.vue index 0e68f1d..191ce4f 100644 --- a/pageB/photo/index.vue +++ b/pageB/photo/index.vue @@ -301,6 +301,7 @@ color: #333; font-size: 28rpx; .title { + line-height: 40rpx; } .name { width: 500rpx; @@ -311,6 +312,8 @@ display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; + margin:8rpx 0; + line-height:36rpx; } .price { color: #FF3131;