首页弹出-边民订单确认

pages/index/index.vue

@@ -86,7 +86,7 @@ export default {
 			roleMenu: [],
 			menuList: [],
 			count: 0,
-			show: true,
+			show: false,
 			order: {}
 		};
 	},

pages/market/one/leader/handle.vue

@@ -85,6 +85,7 @@ export default {
 								method: 'POST',
 								data: { orderId: this.item.id },
 								success: res => {
+									uni.showToast({ title: '订单确认成功' });
 									this.current = 1;
 									uni.setNavigationBarTitle({ title: '互助委托确认' });
 								}
@@ -104,8 +105,9 @@ export default {
 								method: 'POST',
 								data: { orderId: this.item.id },
 								success: res => {
+									uni.showToast({ title: '互助委托确认成功' });
 									this.current = 2;
-									uni.setNavigationBarTitle({ title: '互助委托确认' });
+									uni.setNavigationBarTitle({ title: '进口申报确认' });
 								}
 							});
 						}
@@ -123,7 +125,10 @@ export default {
 								method: 'POST',
 								data: { orderId: this.item.id },
 								success: res => {
-									uni.navigateTo({ url: '/pages/index/index' });
+									uni.showToast({ title: '进口申报确认成功' });
+									setTimeout(() => {
+										uni.switchTab({ url: '/pages/index/index' });
+									}, 1000);
 								}
 							});
 						}

pages/market/one/leader/order.vue

@@ -10,10 +10,6 @@
 						<text class="icon">&#xe830;</text>
 						<text>未确认</text>
 					</view>
-					<view class="state" v-if="item.peopleConfirmStatus == 1 && item.cooperEntrustStatus == 1 && item.applyConfirmStatus == 1 && item.apply == 0">
-						<text class="icon" style="color: #13ce66">&#xe830;</text>
-						<text>未完成</text>
-					</view>
 					<view class="state" v-if="item.resaleStatus == 1">
 						<text class="icon" style="color: #13ce66">&#xe830;</text>
 						<text>已转售</text>
@@ -53,16 +49,19 @@ export default {
 					peopleConfirmStatus: '',	//边民确认状态
 					cooperEntrustStatus: '',	//互助委托申报确认状态
 					applyConfirmStatus: '',		//进口申报确认状态
-					apply: '',					//订单申报状态
 					finishStatus: '',			//订单完成状态
 					resaleStatus: ''			//订单转售状态
 				},
 				{
+					name: '进口中',
+					finishStatus: 0,
+					resaleStatus: 0
+				},
+				{
 					name: '已完成',
 					peopleConfirmStatus: 1,
 					cooperEntrustStatus: 1,
 					applyConfirmStatus: 1,
-					apply: 1,
 					finishStatus: 1,
 					resaleStatus: 0
 				},
@@ -71,7 +70,6 @@ export default {
 					peopleConfirmStatus: 1,
 					cooperEntrustStatus: 1,
 					applyConfirmStatus: 1,
-					apply: 1,
 					finishStatus: 1,
 					resaleStatus: 1
 				}