Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp into master

pages/MallMange/components/orderItem.vue

@@ -158,7 +158,6 @@ export default {
       });
     },
     goOrderDetail(item) {
-      console.log(348, item);
       uni.navigateTo({
         url: "/pages/MallMange/orderDetail?id=" + item.OrderId,
       });

pages/MallMange/components/saleAfterOrderItem.vue

@@ -171,7 +171,6 @@ export default {
       });
     },
      goOrderDetail(item) {
-      console.log(174, item);
       uni.navigateTo({
         url: "/pages/MallMange/afterOrderDetail?id=" + item.ReOrderId,
       });
@@ -212,7 +211,6 @@ export default {
         "/api/MallBase/GetLogisticsDeliveryPage",
         this.regionMsg,
         (res) => {
-          console.log(186, res);
           if (res.resultCode == 1) {
             this.regionlist = res.data.pageData;
             this.regiontotal = res.data.count;
@@ -313,7 +311,6 @@ export default {
     },
   },
   created() {
-    console.log(169, this.data);
   },
 };
 </script>

pages/MallMange/orderSearch.vue

@@ -171,14 +171,17 @@
 			uni.setNavigationBarTitle({
 				title: "订单管理",
 			});
-			if (options.OrderNo) {
-				this.msg2.ReOrderNo = options.OrderNo
-			}
 			if (options?.orderType) {
 				if (options.orderType == 3) {
+					if(options.OrderNo){
+						this.msg2.ReOrderNo = options.OrderNo
+					}
 					this.orderType = 2;
 					this.getList2();
 				} else {
+					if(options.OrderNo){
+						this.msg1.OrderNo = options.OrderNo
+					}
 					this.orderType = 1;
 					this.getList1();
 				}