Merge branch 'wlogin'

pages/order/MyOrder/index.vue

@@ -199,17 +199,19 @@ export default {
     DataFormat
   },
   computed: mapGetters(["userInfo"]),
-  watch: {
-    $yroute(n) {
-      if (n.name === NAME) {
-        const type = parseInt(this.$yroute.query.type) || 0;
-        if (this.type !== type) {
-          this.changeType(type);
-        }
-        this.getOrderData();
-      }
-    },
-    type() {}
+  onShow: function() {
+    console.log(this)
+    this.type = parseInt(this.$yroute.query.type) || 0;
+    this.changeType(this.type);
+    this.getOrderData();
+    this.getOrderList();
+  },
+  onHide: function() {
+    this.orderList = [];
+    this.page = 1;
+    this.limit = 20;
+    this.loaded = false;
+    this.loading = false;
   },
   methods: {
     goLogistics(order) {
@@ -308,11 +310,7 @@ export default {
     },
     toPay() {}
   },
-  mounted() {
-    this.type = parseInt(this.$yroute.query.type) || 0;
-    this.getOrderData();
-    this.getOrderList();
-  },
+  mounted() {},
   onReachBottom() {
     !this.loading && this.getOrderList();
   }
@@ -320,7 +318,6 @@ export default {
 </script>
 
 <style scoped lang="less">
-
 .noCart {
   margin-top: 0.17 * 100rpx;
   padding-top: 0.1 * 100rpx;

pages/order/OrderSubmission/index.vue

@@ -482,9 +482,9 @@
 				uni.showLoading({
 					title: "生成订单中"
 				});
-				let form = {}
+				let from = {}
 				if (this.$deviceType == 'app') {
-					form.form = 'app'
+					from.from = 'app'
 				}
 				createOrder(this.orderGroupInfo.orderKey, {
 						realName: this.contacts,
@@ -500,7 +500,7 @@
 						from: this.from,
 						mark: this.mark || "",
 						shippingType: parseInt(shipping_type) + 1,
-						...form
+						...from
 					})
 					.then(res => {
 						uni.hideLoading();