| @@ -477,7 +477,7 @@ Page({ | |||||
| that.setData({ | that.setData({ | ||||
| begin_time: res.data.beginTime, | begin_time: res.data.beginTime, | ||||
| end_time: res.data.endTime, | end_time: res.data.endTime, | ||||
| activityStatus: res.data.activityStatus | |||||
| activityStatus: res.data.activityStatus ? res.data.activityStatus:'' | |||||
| }) | }) | ||||
| if (res.data.activityStatus == 0 && flag != 'endclock') { | if (res.data.activityStatus == 0 && flag != 'endclock') { | ||||
| that.countdown(res.data.beginTime); | that.countdown(res.data.beginTime); | ||||
| @@ -467,8 +467,8 @@ button::after { | |||||
| .elecard { | .elecard { | ||||
| display: inline-block; | display: inline-block; | ||||
| margin-left: 6rpx; | 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; | border-radius: 8rpx; | ||||
| font-style: normal; | font-style: normal; | ||||
| font-size: 30rpx; | font-size: 30rpx; | ||||
| @@ -215,8 +215,8 @@ page { | |||||
| } | } | ||||
| .notes view:nth-child(1) text { | .notes view:nth-child(1) text { | ||||
| font-size: 24rpx; | |||||
| color: #919191; | |||||
| font-size: 30rpx; | |||||
| color: #333; | |||||
| letter-spacing: 0; | letter-spacing: 0; | ||||
| } | } | ||||
| @@ -226,7 +226,6 @@ page { | |||||
| background: #fff; | background: #fff; | ||||
| display: flex; | display: flex; | ||||
| flex-direction: column; | flex-direction: column; | ||||
| padding-top: 2%; | |||||
| } | } | ||||
| .notes view:nth-child(2) > text { | .notes view:nth-child(2) > text { | ||||