|
|
@ -542,6 +542,8 @@ |
|
|
getAreaData:{}, |
|
|
getAreaData:{}, |
|
|
putAreaData:{}, |
|
|
putAreaData:{}, |
|
|
yongjin:false, |
|
|
yongjin:false, |
|
|
|
|
|
waimailistData:[], |
|
|
|
|
|
kuaidilistData:[], |
|
|
isgetArea: false, |
|
|
isgetArea: false, |
|
|
isputArea:false, |
|
|
isputArea:false, |
|
|
checkYongjin:false, |
|
|
checkYongjin:false, |
|
|
@ -642,7 +644,7 @@ |
|
|
getAreaId:waimailist[a].getAreaId, |
|
|
getAreaId:waimailist[a].getAreaId, |
|
|
putAreaId:waimailist[a].putAreaId |
|
|
putAreaId:waimailist[a].putAreaId |
|
|
} |
|
|
} |
|
|
this.searchForm.waimaiData.push(waimai) |
|
|
this.waimailistData.push(waimai) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -654,10 +656,12 @@ |
|
|
getAreaId:waimailist[a].getAreaId, |
|
|
getAreaId:waimailist[a].getAreaId, |
|
|
putAreaId:waimailist[a].putAreaId |
|
|
putAreaId:waimailist[a].putAreaId |
|
|
} |
|
|
} |
|
|
this.searchForm.kuaidiData.push(waimai) |
|
|
this.kuaidilistData.push(waimai) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
this.searchForm.waimaiData = this.waimailistData; |
|
|
|
|
|
this.searchForm.kuaidiData = []; |
|
|
this.getDelivery(); |
|
|
this.getDelivery(); |
|
|
this.getShopArea(); |
|
|
this.getShopArea(); |
|
|
this.$refs.tabBar.getWorkerCounts() |
|
|
this.$refs.tabBar.getWorkerCounts() |
|
|
@ -933,12 +937,20 @@ |
|
|
this.checked = type |
|
|
this.checked = type |
|
|
if(type == 'waimai'){ |
|
|
if(type == 'waimai'){ |
|
|
this.searchForm.deliveryType = 1 |
|
|
this.searchForm.deliveryType = 1 |
|
|
|
|
|
this.searchForm.waimaiData = this.waimailistData; |
|
|
|
|
|
this.searchForm.kuaidiData = []; |
|
|
}else if(type == 'kuaidi'){ |
|
|
}else if(type == 'kuaidi'){ |
|
|
this.searchForm.deliveryType = 2 |
|
|
this.searchForm.deliveryType = 2 |
|
|
|
|
|
this.searchForm.waimaiData = []; |
|
|
|
|
|
this.searchForm.kuaidiData = this.kuaidilistData; |
|
|
}else if(type == 'paotui'){ |
|
|
}else if(type == 'paotui'){ |
|
|
this.searchForm.deliveryType = 3 |
|
|
this.searchForm.deliveryType = 3 |
|
|
|
|
|
this.searchForm.waimaiData = []; |
|
|
|
|
|
this.searchForm.kuaidiData = []; |
|
|
}else if(type == 'zhipai'){ |
|
|
}else if(type == 'zhipai'){ |
|
|
this.searchForm.deliveryType = 4 |
|
|
this.searchForm.deliveryType = 4 |
|
|
|
|
|
this.searchForm.waimaiData = []; |
|
|
|
|
|
this.searchForm.kuaidiData = []; |
|
|
} |
|
|
} |
|
|
this.getDelivery() |
|
|
this.getDelivery() |
|
|
this.$forceUpdate() |
|
|
this.$forceUpdate() |
|
|
|