|
|
@@ -19,7 +19,12 @@
|
|
|
<text style="position:absolute;top:2upx;left:90upx;font-size:11upx;">{{item.sn}}</text>
|
|
|
</view>
|
|
|
<view class="item-price-num">
|
|
|
- <view v-if="item.hasReachTime == 1">{{item.reachDate == today ? '今天' : item.reachDate.substr(5,9)}} {{item.reachPeriod}}</view>
|
|
|
+ <view v-if="item.hasReachTime == 1">
|
|
|
+ <text v-if="item.reachDate == item.today">今天</text>
|
|
|
+ <text v-else-if="item.reachDate == item.tomorrow">明天</text>
|
|
|
+ <text v-else>{{item.reachDate.substr(5,9)}}</text>
|
|
|
+ <text style="margin-left:5upx;">{{item.reachPeriod}} 前</text>
|
|
|
+ </view>
|
|
|
<view v-else></view>
|
|
|
<view>{{item.status == 0 ? '待完成':item.status==1?'已完成':item.status==2?'已取消':'待完成'}}</view>
|
|
|
</view>
|
|
|
@@ -63,7 +68,6 @@ export default {
|
|
|
selectOrderId:0,
|
|
|
triggered:false,
|
|
|
_freshing: false,
|
|
|
- today:'',
|
|
|
sn:'',
|
|
|
thirdSn:'',
|
|
|
snTitle:'编号'
|
|
|
@@ -152,7 +156,6 @@ export default {
|
|
|
if(this.list.data && this.list.data[0]){
|
|
|
this.getOrder(this.list.data[0])
|
|
|
}
|
|
|
- this.today = res.data.today
|
|
|
}
|
|
|
})
|
|
|
}
|
shish