From f1bdb5c4cb355739c9fe56c4bc58646b88651fe3 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Thu, 8 Aug 2019 15:56:06 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B8=E5=8C=85=EF=BC=8C=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=E8=AF=A6=E6=83=85][=E4=BF=AE=E6=94=B9]:[=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=88=B8=E5=8C=85=E5=92=8C=E5=88=B8=E7=9A=84=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E7=9A=84=E6=A0=B7=E5=BC=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/coupon/detail/index.js | 2 +- pages/coupon/detail/index.wxss | 4 ++-- pages/couponorder/detail/index.wxss | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index cbeb04c..99dc24f 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -477,7 +477,7 @@ Page({ that.setData({ begin_time: res.data.beginTime, end_time: res.data.endTime, - activityStatus: res.data.activityStatus + activityStatus: res.data.activityStatus ? res.data.activityStatus:'' }) if (res.data.activityStatus == 0 && flag != 'endclock') { that.countdown(res.data.beginTime); diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss index 424304e..1c40764 100644 --- a/pages/coupon/detail/index.wxss +++ b/pages/coupon/detail/index.wxss @@ -467,8 +467,8 @@ button::after { .elecard { display: inline-block; margin-left: 6rpx; - color: #af6e34; - border: 1px solid #af6e34; + color: rgba(254,70,20,1); + border: 1px solid rgba(254,70,20,1); border-radius: 8rpx; font-style: normal; font-size: 30rpx; diff --git a/pages/couponorder/detail/index.wxss b/pages/couponorder/detail/index.wxss index 610c552..ea5eb13 100644 --- a/pages/couponorder/detail/index.wxss +++ b/pages/couponorder/detail/index.wxss @@ -215,8 +215,8 @@ page { } .notes view:nth-child(1) text { - font-size: 24rpx; - color: #919191; + font-size: 30rpx; + color: #333; letter-spacing: 0; } @@ -226,7 +226,6 @@ page { background: #fff; display: flex; flex-direction: column; - padding-top: 2%; } .notes view:nth-child(2) > text {