1

src/views/app/business/lineManage/addEdit.vue

@@ -86,7 +86,7 @@
 			</div>
 			<div class="drawer-footer br" v-show="type != '0'">
 				<Button type="primary" :loading="submitLoading" @click="submit">提交</Button>
-				<Button @click="visible = false">取消</Button>
+				<Button @click="cannelPage">取消</Button>
 			</div>
 		</Drawer>
 		<Modal :title="商品列表" v-model="aaVisiable" :mask-closable="false" :scrollabele="true" :width="1000">
@@ -301,6 +301,12 @@
 					that.$refs.goodsPage.init(that.form.linkParams);
 				});
 			},
+			cannelPage(){
+				this.adList=[{
+					pic: ''
+				}],
+				this.visible = false
+			},
 			getGoods(v) {
 				console.log('11111', v)
 				this.form.productList1.productImage = v.productPicture
@@ -329,7 +335,7 @@
 				for (let i = 0; i < this.shopList.length; i++) {
 					if (this.shopList[i].id == v) {
 						let data = {
-							products: this.shopList[i].products,
+							// products: this.shopList[i].products,
 							id: this.shopList[i].id,
 							shopName: this.shopList[i].shopName,
 							shopPhone: this.shopList[i].shopPhone,

src/views/app/business/logistics/logistics.vue

@@ -11,19 +11,14 @@
 				<TabPane label="跑腿订单" name="3"></TabPane>
 			</Tabs>
 			<Tabs v-model="tabName1" :animated="false" @on-click="changeTab">
+				<TabPane label="指派单" name="7"></TabPane>
 				<TabPane label="待接单" name="0"></TabPane>
 				<TabPane label="待取货" name="1"></TabPane>
 				<TabPane label="待送达" name="2"></TabPane>
-				<TabPane label="全部" name="10"></TabPane>
-				<TabPane label="待支付" name=""></TabPane>
-				<TabPane label="待成团" name=""></TabPane>
-				<TabPane label="待消费" name=""></TabPane>
-				<TabPane label="已完成" name=""></TabPane>
-				<TabPane label="待退款" name=""></TabPane>
-				<TabPane label="已退款" name=""></TabPane>
-				<TabPane label="已取消" name=""></TabPane>
-				<TabPane label="售后中" name=""></TabPane>
-				<TabPane label="已售后" name=""></TabPane>
+				<TabPane label="已完成" name="3"></TabPane>
+				<TabPane label="已退款" name="5"></TabPane>
+				<TabPane label="已取消" name="4"></TabPane>
+				<TabPane label="预订单" name="6"></TabPane>
 			</Tabs>
 			<Row v-show="openSearch" @keydown.enter.native="handleSearch">
 				<Form ref="searchForm" :model="searchForm" inline :label-width="90">