修改

pages/guidecar/orderList.vue

@@ -140,7 +140,7 @@
 						<view class="order_Btn_inner">
 							<view class="order_Btn_Com" @click.stop="buy(item)" style="color:#FF4048;border-color:#FF4048;">再次购买</view>
 							<!-- <view class="order_Btn_Com">评价晒单</view> -->
-							<view class="order_Btn_Com" @click="cancel(item,index)" v-if="item.OrderStatus==1||item.OrderStatus==2||item.OrderStatus==3">取消订单</view>
+							<view class="order_Btn_Com" @click.stop="cancel(item,index)" v-if="item.OrderStatus==1||item.OrderStatus==2||item.OrderStatus==3">取消订单</view>
 						</view>
 					</view>
 				</view>
@@ -236,8 +236,8 @@
 			}, 1000);
 		},
 		onLoad(option) {
+			this.current = option.status || -1;
 			this.getHeadList();
-			this.getContent();
 			this.u = uni.getStorageSync("mall_UserInfo");
 		},
 		methods: {
@@ -265,6 +265,8 @@
 								Name: '全部'
 							}
 							this.headData.unshift(obj)
+							this.msg.OrderStatus=this.headData[this.current].Id;
+							this.getContent();
 						}
 					}
 				);
@@ -324,7 +326,7 @@
 				this.Cancelmsg.OrderId = e.OrderId;
 				this.Cancelmsg.Type = e.OrderStatus == 1 ? 1 : 2;
 			},
-			//取消订单
+			//确认订单
 			confirm() {
 				let that = this
 				// that.showModal = false;

pages/user-center/user-center.vue

@@ -129,22 +129,22 @@
 							<view v-if="item.link_url == '/pages/guidecar/orderList?status=1' && user_info.MyGuideCarOrder.NonPayment > 0" class="badge" :style="{ background: mainColor }">
 								{{ user_info.MyGuideCarOrder.NonPayment }}
 							</view>
-							<!-- 待发货 -->
+							<!-- 待确认 -->
 							<view v-if="item.link_url == '/pages/guidecar/orderList?status=2' && user_info.MyGuideCarOrder.WaitSendGoods > 0" class="badge" :style="{ background: mainColor }">
 								{{ user_info.MyGuideCarOrder.WaitSendGoods }}
 							</view>
-							<!-- 待收货 -->
+							<!-- 待出行 -->
 							<view v-if="item.link_url == '/pages/guidecar/orderList?status=3' && user_info.MyGuideCarOrder.WaitReceiving > 0" class="badge" :style="{ background: mainColor }">
 								{{ user_info.MyGuideCarOrder.WaitReceiving }}
 							</view>
+							<!-- 出行中 -->
+							<view v-if="item.link_url == '/pages/guidecar/orderList?status=4' && user_info.MyGuideCarOrder.GuideCarWaitCommentNum > 0" class="badge" :style="{ background: mainColor }">
+								{{ user_info.MyGuideCarOrder.Completed }}
+							</view>
 							<!-- 待评价 -->
-							<view v-if="item.link_url == '/pages/guidecar/order-commit' && user_info.MyGuideCarOrder.GuideCarWaitCommentNum > 0" class="badge" :style="{ background: mainColor }">
+							<view v-if="item.link_url == '/pages/guidecar/order-commit' && user_info.MyGuideCarOrder.Completed > 0" class="badge" :style="{ background: mainColor }">
 								{{ user_info.MyGuideCarOrder.GuideCarWaitCommentNum }}
 							</view>
-							<!-- 售后 -->
-							<view v-if="item.link_url == '/pages/guidecar/orderList?status=5' && user_info.MyGuideCarOrder.Completed > 0" class="badge" :style="{ background: mainColor }">
-								{{ user_info.MyGuideCarOrder.Completed }}
-							</view>
 						</view>
 					</view>
 				</view>