|
@@ -44,23 +44,24 @@
|
|
|
<view @click="intoWaitOrderDetail(item)"
|
|
|
class="cont-item-right flex_1 flex flex_column justify_between">
|
|
|
<view class="flex align_center justify_between">
|
|
|
- <view class="flex_1 bold ellipsis-one">{{item.contactName}}</view>
|
|
|
+ <view class="flex_1 bold ellipsis-one">{{item.customerName||'--'}}</view>
|
|
|
<view class="do-btn">去处理</view>
|
|
|
</view>
|
|
|
<view class="greey-font flex align_center justify_between">
|
|
|
- <view class="dizhi">{{item.contactAddress+(item.houseAddress||'')}}</view>
|
|
|
+ <view class="greey-font">{{item.createDate}}</view>
|
|
|
<view v-if="item.distance" @click.stop="openLocation(item)" class="flex align_center">
|
|
|
<u-icon class="icon" name="icon_coordinate1" custom-prefix="custom-icon" size="20"
|
|
|
color="#999999"></u-icon>
|
|
|
<text>{{item.distance}}KM</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="greey-font">{{item.reserveTime}},预估{{item.reserveWeightDictValue}}</view>
|
|
|
+ <view class="greey-font">{{item.address || '--'}}</view>
|
|
|
+ <!-- <view class="greey-font">{{item.reserveTime}}</view>
|
|
|
<view class="type">
|
|
|
<text v-for="(key,index) in item.reserveTypeList" :key="index" class="mark">
|
|
|
{{key}}
|
|
|
</text>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
@@ -245,12 +246,22 @@
|
|
|
}
|
|
|
})
|
|
|
|
|
|
+ },
|
|
|
+ // 截取市以下的地址
|
|
|
+ getArea(obj,state) {
|
|
|
+ var index=obj.lastIndexOf("\市");
|
|
|
+ if(state==0){
|
|
|
+ obj=obj.substring(0,index);
|
|
|
+ }else {
|
|
|
+ obj=obj.substring(index+1,obj.length);
|
|
|
+ }
|
|
|
+ return obj;
|
|
|
},
|
|
|
// 待处理订单信息
|
|
|
getList(lat, lng) {
|
|
|
- uni.showLoading({
|
|
|
- title: '加载中...'
|
|
|
- })
|
|
|
+ // uni.showLoading({
|
|
|
+ // title: '加载中...'
|
|
|
+ // })
|
|
|
waitOrderQuery({
|
|
|
handleUserLng: lng,
|
|
|
handleUserLat: lat
|
|
@@ -264,6 +275,13 @@
|
|
|
item.reserveTime = moment(item.reserveDateBegin).format('YYYY-MM-DD') + item
|
|
|
.reserveTimeTypeDictValue
|
|
|
item.reserveTypeList = item.reserveRubbishType.split(',')
|
|
|
+
|
|
|
+
|
|
|
+ if(item.receiveAreasName){
|
|
|
+ item.cityAddress=this.getArea(item.receiveAreasName,1)
|
|
|
+ }
|
|
|
+ console.log(item.cityAddress,'-----------item.cityAddress=============')
|
|
|
+ item.address=(item.houseAddress? item.receiveAddress:'')+(item.cityAddress? '('+item.cityAddress+')':'')
|
|
|
})
|
|
|
this.noDataText = '暂无数据'
|
|
|
} else {
|