|
|
@@ -24,7 +24,11 @@
|
|
|
<view class="nav acea-row row-around row-middle" id="nav">
|
|
|
<!-- #endif -->
|
|
|
<scroll-view scroll-x="true" class="scroll_view">
|
|
|
- <view class="item" :class="state == 'await' ? 'on' : ''" @click="changeStatus('await')">
|
|
|
+ <view class="item" :class="state == 'all' ? 'on' : ''" @click="changeStatus('all')" v-if="searchListData.type ==-1">
|
|
|
+ 全部({{headerArr['all']!=undefined?headerArr['all']:0}})
|
|
|
+ <image src="../static/adorn.png" v-if="state == 'all'"></image>
|
|
|
+ </view>
|
|
|
+ <view class="item" :class="state == 'await' ? 'on' : ''" @click="changeStatus('await')" v-if="searchListData.type != -1">
|
|
|
待接单
|
|
|
<image src="../static/adorn.png" v-if="state == 'await'"></image>
|
|
|
</view>
|
|
|
@@ -34,7 +38,7 @@
|
|
|
</view-->
|
|
|
<view class="item" :class="state == 'pickUp' ? 'on' : ''" @click="changeStatus('pickUp')">
|
|
|
待取货({{headerArr['pickUp']!=undefined?headerArr['pickUp']:0}})
|
|
|
- <image src="../static/adorn.png" v-if="state == 'spike'"></image>
|
|
|
+ <image src="../static/adorn.png" v-if="state == 'pickUp'"></image>
|
|
|
</view>
|
|
|
<view class="item" :class="state == 'delivery' ? 'on' : ''"
|
|
|
@click="changeStatus('delivery')">
|
|
|
@@ -109,13 +113,11 @@
|
|
|
<view class="money">
|
|
|
配送费 <baseMoney :money="item.deliveCharge" symbolSize="20" integerSize="32" decimalSize="20">
|
|
|
</baseMoney>
|
|
|
- <!-- <view class="num">共{{ item.totalNum }}件</view> -->
|
|
|
<view class="num">距离{{ item.distance }}km</view>
|
|
|
<view class="map" @click="goMap(item)">
|
|
|
<text class="iconfont icon-chakanditu"></text>
|
|
|
<view class="map_text">查看地图</view>
|
|
|
</view>
|
|
|
- <!-- <view class="num">距离4.5km</view> -->
|
|
|
</view>
|
|
|
|
|
|
</view>
|
|
|
@@ -223,7 +225,7 @@
|
|
|
orderGetVerfication
|
|
|
} from '@/api/work.js';
|
|
|
import {
|
|
|
- riderOrderList,riderOrderReceiving,orderStatusNum,orderPickUp,orderComplete,orderCancel
|
|
|
+ riderOrderAllList,riderOrderList,riderExpressOrderList,riderOrderReceiving,orderStatusNum,orderPickUp,orderComplete,orderCancel
|
|
|
} from '@/api/rider.js';
|
|
|
export default {
|
|
|
name: "AdminOrderList",
|
|
|
@@ -307,7 +309,7 @@
|
|
|
orderNo: '',
|
|
|
page: 1,
|
|
|
status: 'await',
|
|
|
- type: 0,
|
|
|
+ type: 1,
|
|
|
latitude: uni.getStorageSync('user_latitude'),
|
|
|
longitude: uni.getStorageSync('user_longitude'),
|
|
|
},
|
|
|
@@ -318,6 +320,7 @@
|
|
|
onLoad(options) {
|
|
|
this.state = options.type ? options.type : 'await';
|
|
|
this.searchListData.status = options.type ? options.type : 'await';
|
|
|
+ this.searchListData.type = options.orderType ? options.orderType : -1;
|
|
|
},
|
|
|
// created() {
|
|
|
// this.getInitList()
|
|
|
@@ -344,7 +347,9 @@
|
|
|
//订单列表
|
|
|
getInitList(type) {
|
|
|
this.loading=true;
|
|
|
- riderOrderList(this.searchListData).then(res => {
|
|
|
+ //let api=riderOrderList;
|
|
|
+ let api=this.searchListData.type==0?riderOrderList:(this.searchListData.type==1?riderExpressOrderList:riderOrderAllList);
|
|
|
+ api(this.searchListData).then(res => {
|
|
|
//下拉触底
|
|
|
if (type == 'bottom') {
|
|
|
this.list = this.list.concat(res.data.list)
|
|
|
@@ -360,10 +365,11 @@
|
|
|
this.loading=false;
|
|
|
},
|
|
|
toDetail(item) {
|
|
|
- uni.navigateTo({
|
|
|
- //url: `/pages/rider_index/order/detail?orderNo=${item.orderNo}&deliveCharge=${item.deliveCharge}`
|
|
|
- url: `/pages/rider_index/order/detail?orderInfo=${JSON.stringify(item)}`
|
|
|
- })
|
|
|
+ uni.navigateTo({
|
|
|
+ //url: `/pages/rider_index/order/detail?orderNo=${item.orderNo}&deliveCharge=${item.deliveCharge}`
|
|
|
+ url: this.searchListData.type==1?`/pages/rider_index/express/detail?orderInfo=${JSON.stringify(item)}`:`/pages/rider_index/order/detail?orderInfo=${JSON.stringify(item)}`
|
|
|
+ })
|
|
|
+
|
|
|
|
|
|
},
|
|
|
//查看内置地图
|
