diff --git a/components/CountDown.vue b/components/CountDown.vue index 26e607b..c163712 100644 --- a/components/CountDown.vue +++ b/components/CountDown.vue @@ -155,7 +155,8 @@ export default { font-family: PingFang SC; font-weight: 600; color: #3A3A3C; - line-height: 38rpx; + line-height: 60rpx; + height: 60rpx; } } diff --git a/components/CouponListWindow.vue b/components/CouponListWindow.vue index df9fb91..6fbbc38 100644 --- a/components/CouponListWindow.vue +++ b/components/CouponListWindow.vue @@ -17,11 +17,15 @@ - ¥{{ coupon.couponPrice }} + + + + ¥{{ coupon.couponPrice }} - {{coupon.ctype?'仅限定品牌可用':'全部商品可用'}} + + {{coupon.cname}} 不限时 到期时间{{ coupon.endTime }} @@ -29,7 +33,7 @@ - {{'满减券' || '折扣券'}} + {{coupon.image.length>0? (coupon.couponPrice+'元'):'满减券' || '折扣券'}} 满{{ coupon.useMinPrice }}可用 @@ -80,9 +84,24 @@ left: 16rpx; } .text-box { - padding-top: 28rpx; + // padding-top: 28rpx; padding-left: 32rpx; padding-right: 30rpx; + .wrappers{ + padding: 0 15rpx; + box-sizing: content-box; + height: 100%; + .img{ + width: 110rpx; + height: 110rpx; + border-radius: 16rpx; + margin:12rpx 37rpx 12rpx 0; + background-color: #fff; + } + .img:nth-child(3){ + margin-right: 0; + } + } } } .icon-weixuanzhong { diff --git a/pages/home/index.vue b/pages/home/index.vue index e335ca9..c406714 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -113,11 +113,11 @@ 秒杀专区 - - - 更多活动 - - + + + 更多活动 + + @@ -668,6 +668,11 @@ } }, + goActivity(){ + this.$yrouter.push({ + path: "/pages/activity/activity/index", + }); + }, goComDetail(item){ let id=item.id this.$yrouter.push({ @@ -1184,7 +1189,7 @@ text-align: center; margin-right: 18rpx; } - text::after { + .hoverClass::after { content: ''; display: inline-block; width: 0; @@ -1193,9 +1198,9 @@ border-left: 10rpx solid #2DB5AE; border-bottom: 6rpx solid transparent; border-right: 0rpx solid transparent; - margin: 0 20rpx 4rpx 8rpx; + margin: 0 20rpx 0 8rpx; } - text{ + .hoverClass{ font-size: 24rpx; color: #2DB5AE; } diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index 8168b1e..471da71 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -74,7 +74,7 @@ {{ usableCoupon.couponTitle || '选择优惠券' }} - -¥{{usableCoupon.couponPrice}} + -¥{{usableCoupon.couponPrice}} diff --git a/pages/shop/HotNewGoods/index.vue b/pages/shop/HotNewGoods/index.vue index f234730..a7e1e53 100644 --- a/pages/shop/HotNewGoods/index.vue +++ b/pages/shop/HotNewGoods/index.vue @@ -122,7 +122,7 @@ export default { data: function() { return { banner: [], - classifyType: 0, + classifyType: -1, classifyList: [], mouthList: [], mouthIndex: 0, @@ -206,10 +206,11 @@ export default { }else{ // this.form.hotListId = this.classifyList[this.classifyType].id; this.form.hotListId = ''; - this.subclassList = this.classifyList[this.classifyType].cateDtos; + this.subclassList = this.classifyList[0].cateDtos; this.subclass = this.subclassList[0]; // this.form.cateId = this.subclass.cateId; this.form.cateId = ' '; + this.classifyType=0 this.getHotList(); } @@ -233,6 +234,7 @@ export default { }, // 榜单 changeClassify(i) { + if(this.classifyType == i) return this.classifyType = i; this.form.hotListId = this.classifyList[this.classifyType].id;