|
@@ -5,8 +5,13 @@
|
|
<!-- 订单状态 -->
|
|
<!-- 订单状态 -->
|
|
<view class="order-status">
|
|
<view class="order-status">
|
|
<view class="status-title flex align_center justify_center">
|
|
<view class="status-title flex align_center justify_center">
|
|
- <view class="t-icon icon t-icon-icon_complete"></view>
|
|
|
|
- {{orderInfo.orderStatusDictValue || '--'}}
|
|
|
|
|
|
+ <u-icon v-if="orderInfo.orderStatusDictValue=='已完成'" class="icon" name="prescription_order_icon_success"
|
|
|
|
+ custom-prefix="custom-icon" size="48" color="#333333"></u-icon>
|
|
|
|
+ <u-icon v-if="orderInfo.orderStatus=='CANCEL'" class="icon" name="prescription_order_icon_cancel"
|
|
|
|
+ custom-prefix="custom-icon" size="48" color="#333333"></u-icon>
|
|
|
|
+ <!-- <view class="t-icon icon t-icon-icon_complete"></view> -->
|
|
|
|
+ <view class="t-icon icon t-icon-prescription_order_icon_cancel"></view>
|
|
|
|
+ {{orderInfo.orderStatusDictValue || '--'}}
|
|
</view>
|
|
</view>
|
|
<view class="status-care">
|
|
<view class="status-care">
|
|
预约时间:{{orderInfo.reserveTime}}
|
|
预约时间:{{orderInfo.reserveTime}}
|
|
@@ -22,7 +27,7 @@
|
|
<view class="time flex align_center justify_between">
|
|
<view class="time flex align_center justify_between">
|
|
<text>{{orderInfo.contactName}}</text>
|
|
<text>{{orderInfo.contactName}}</text>
|
|
<view class="flex align_center">
|
|
<view class="flex align_center">
|
|
- <view class="t-icon phone t-icon-icon_phone"></view>
|
|
|
|
|
|
+ <u-icon class="phone" name="icon_phone" custom-prefix="custom-icon" size="28" color="#999999"></u-icon>
|
|
<text>{{orderInfo.contactMobile}}</text>
|
|
<text>{{orderInfo.contactMobile}}</text>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
@@ -40,9 +45,6 @@
|
|
</view>
|
|
</view>
|
|
<!-- 订单信息 -->
|
|
<!-- 订单信息 -->
|
|
<view class="item-info">
|
|
<view class="item-info">
|
|
- <!-- <view class="item flex justify_between">
|
|
|
|
- <text class="item-title">订单信息</text>
|
|
|
|
- </view> -->
|
|
|
|
<view class="item flex justify_between">
|
|
<view class="item flex justify_between">
|
|
<text>订单编号</text>
|
|
<text>订单编号</text>
|
|
<text>{{orderInfo.orderReserveNo||'--'}}</text>
|
|
<text>{{orderInfo.orderReserveNo||'--'}}</text>
|
|
@@ -51,13 +53,17 @@
|
|
<text>下单时间</text>
|
|
<text>下单时间</text>
|
|
<text>{{orderInfo.createDate}}</text>
|
|
<text>{{orderInfo.createDate}}</text>
|
|
</view>
|
|
</view>
|
|
- <view class="item flex justify_between">
|
|
|
|
|
|
+ <view v-if="orderInfo.orderStatus!='CANCEL'" class="item flex justify_between">
|
|
<text>服务时间</text>
|
|
<text>服务时间</text>
|
|
- <text>{{orderInfo.finishDate}}</text>
|
|
|
|
|
|
+ <text>{{orderInfo.finishDate || '--'}}</text>
|
|
|
|
+ </view>
|
|
|
|
+ <view v-if="orderInfo.orderStatus=='CANCEL'" class="item flex justify_between">
|
|
|
|
+ <text>取消原因</text>
|
|
|
|
+ <text>{{orderInfo.cancelReason || '--'}}</text>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
<!-- 回收品类明细 -->
|
|
<!-- 回收品类明细 -->
|
|
- <view class="item-info">
|
|
|
|
|
|
+ <view v-if="typeData.length" class="item-info">
|
|
<view class="item-title flex justify_between">
|
|
<view class="item-title flex justify_between">
|
|
<text>回收品类明细</text>
|
|
<text>回收品类明细</text>
|
|
</view>
|
|
</view>
|
|
@@ -75,7 +81,7 @@
|
|
<view class="item-info">
|
|
<view class="item-info">
|
|
<view class="item flex justify_between">
|
|
<view class="item flex justify_between">
|
|
<text>应付金额</text>
|
|
<text>应付金额</text>
|
|
- <text>{{orderInfo.originaAmount}} 元</text>
|
|
|
|
|
|
+ <text>{{orderInfo.originaAmount||0}} 元</text>
|
|
</view>
|
|
</view>
|
|
<view class="item flex justify_between">
|
|
<view class="item flex justify_between">
|
|
<text>支付方式</text>
|
|
<text>支付方式</text>
|
|
@@ -135,24 +141,27 @@
|
|
this.orderInfo.reserveTime = moment(this.orderInfo.confirmDate).format('YYYY-MM-DD') + this.orderInfo.reserveTimeTypeDictValue
|
|
this.orderInfo.reserveTime = moment(this.orderInfo.confirmDate).format('YYYY-MM-DD') + this.orderInfo.reserveTimeTypeDictValue
|
|
let data = this.$refs.rubbishType.getDataList()
|
|
let data = this.$refs.rubbishType.getDataList()
|
|
// 重组类型数据
|
|
// 重组类型数据
|
|
- data.map(k =>{
|
|
|
|
- let arr = this.orderInfo.orderReserveItemEntityList.filter(item=>{
|
|
|
|
- return item.rubbishType == k.code
|
|
|
|
- })
|
|
|
|
- console.log(arr,'dddd')
|
|
|
|
- if(arr.length) {
|
|
|
|
- let p = {
|
|
|
|
- typeCode: k.code,
|
|
|
|
- name: k.dispName,
|
|
|
|
- typeList: arr
|
|
|
|
|
|
+ if(this.orderInfo.orderReserveItemEntityList) {
|
|
|
|
+ data.map(k =>{
|
|
|
|
+ let arr = this.orderInfo.orderReserveItemEntityList.filter(item=>{
|
|
|
|
+ return item.rubbishType == k.code
|
|
|
|
+ })
|
|
|
|
+ console.log(arr,'dddd')
|
|
|
|
+ if(arr.length) {
|
|
|
|
+ let p = {
|
|
|
|
+ typeCode: k.code,
|
|
|
|
+ name: k.dispName,
|
|
|
|
+ typeList: arr
|
|
|
|
+ }
|
|
|
|
+ this.typeData.push(p)
|
|
|
|
+ console.log(p,this.typeData,'pppppp')
|
|
}
|
|
}
|
|
- this.typeData.push(p)
|
|
|
|
- console.log(p,this.typeData,'pppppp')
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
- this.typeData.map(item=>{
|
|
|
|
- this.typeNames = (this.typeNames ? (this.typeNames + ','):'') + item.name
|
|
|
|
- })
|
|
|
|
|
|
+ })
|
|
|
|
+ this.typeData.map(item=>{
|
|
|
|
+ this.typeNames = (this.typeNames ? (this.typeNames + ','):'') + item.name
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
uni.hideLoading()
|
|
uni.hideLoading()
|
|
})
|
|
})
|