Commit 5133b1f8 authored by 刘用法's avatar 刘用法

红色&&

parent 46846795
......@@ -108,7 +108,7 @@
<!-- 过程反馈 -->
<view class="left">
<view v-if="allowFeedback" @click="clickFeedback" class="button">
<text>过程反馈</text>
<text>反馈</text>
</view>
</view>
<!--接单,抢单,已被抢, 预约 ,签到 ,去完工 timestampDiff(order.currentOverTime)>0 -->
......@@ -142,7 +142,7 @@
<!-- 异常预约 ,现场拍照 这里是调用拍照的两个组件-->
<view class="right">
<view v-if="errorSignIn || scenePhoto" @click="$u.debounce(handleClickRight, 500)" :class="['button', {'active': scenePhoto}]">
<text>{{errorSignIn ? '异常签到' : '现场拍照'}}</text>
<text>{{errorSignIn ? '异常签到' : '拍照'}}</text>
</view>
</view>
......@@ -386,7 +386,7 @@
self.order = res.data
this.getCurrentBtn()
var nowTime = new Date();
if(this.order.currentOverTime && nowTime.getTime() > this.order.currentOverTime){
if(this.showTimeOut && this.order.currentOverTime && nowTime.getTime() > this.order.currentOverTime){
this.btnClass='timeOut-btn'
}
if(self.order.isFirstOrder){
......
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