Commit 3ff6ca24 authored by Mac's avatar Mac

1

parent 47215c2f
......@@ -131,8 +131,6 @@
</view>
<view style="width: 100%;height: 10px;"></view>
</view>
</view>
</view>
<view class="active_Title">活动有效期</view>
......
......@@ -34,7 +34,7 @@
<view class="speed">
<text v-if="calculation(x)==100 && x.IsFinish==2" :style="{'color':mainColor}">已完成活动,等待发放奖励</text>
<text style="margin-left: 5px;" v-if="x.IsFinish==1" :style="{'color':mainColor}">已完成</text>
<text v-if="msg.QActivityState ==2 && x.IsFinish==2" style="color: #777777;">未完成</text>
<text v-if="msg.QActivityState ==2 && x.IsFinish==2 && calculation(x)!=100" style="color: #777777;">未完成</text>
</view>
</view>
......@@ -184,7 +184,7 @@
if(x.IsFinish ==1 || percent>100){ //如果完成了直接是百分百
percent = 100
}else{
percent.toFixed(2)
percent = percent.toFixed(2)
}
return percent
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment