|
@@ -12,8 +12,10 @@
|
|
|
<view class="bottom-new-notice" v-if="orderStatusText">
|
|
|
<view class="notice-content">
|
|
|
<view class="notice-content-item"><u-icon class="icon" name="home_icon_bells" custom-prefix="custom-icon" size="38" color="#333"></u-icon></span><span class="item-title">最新通知</span></view>
|
|
|
- <view class="notice-content-item">骑手<span>{{orderStatusText ? orderStatusText :''}},</span>请耐心等待</view>
|
|
|
- <view class="notice-content-item">{{orderTime ? orderTime :''}}</view>
|
|
|
+ <view class="notice-content-item" v-if="itemOrderStatus=='CONFIRM'">订单<span>{{orderStatusText ? orderStatusText :''}},</span>请耐心等待</view>
|
|
|
+ <view class="notice-content-item" v-if="itemOrderStatus=='CONFIRM'">{{orderTime ? orderTime :''}}</view>
|
|
|
+ <view class="notice-content-item" v-if="itemOrderStatus=='FINISH'">订单<span>{{orderStatusText ? orderStatusText :''}},</span>欢迎再次下单</view>
|
|
|
+ <view class="notice-content-item" v-if="itemOrderStatus=='FINISH'">{{finishTime ? finishTime :''}}</view>
|
|
|
</view>
|
|
|
<view class="notice-static">
|
|
|
<span class="notice-static-text">{{orderStatusText ? orderStatusText :''}}</span>
|
|
@@ -76,8 +78,10 @@
|
|
|
},
|
|
|
hasLogin:false, // 是否登录
|
|
|
noDataText:"", // 未登录提示文字
|
|
|
+ itemOrderStatus:'', //
|
|
|
orderStatusText:'', // 订单状态
|
|
|
orderTime:'', //
|
|
|
+ finishTime:'', // 订单完成时间
|
|
|
bannerList:[],
|
|
|
rubbishPaperName:"",
|
|
|
rubbishSLName:"",
|
|
@@ -130,8 +134,10 @@
|
|
|
getOrderStatus(){
|
|
|
orderStatus().then(res=>{
|
|
|
if(res.status==200){
|
|
|
+ this.itemOrderStatus=res.data.orderStatus
|
|
|
this.orderStatusText=res.data.orderStatusDictValue
|
|
|
- this.orderTime=res.data.createDate
|
|
|
+ this.orderTime=res.data.reserveDateBegin.substring(0,10)+' '+res.data.reserveTimeTypeDictValue
|
|
|
+ this.finishTime=res.data.finishDate
|
|
|
console.log(res,'----------订单状态')
|
|
|
}
|
|
|
})
|