Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!102

src/views/order/channel/detail.vue

@@ -172,6 +172,14 @@ export default {
     this.getDetail();
     this.getChannelList();
   },
+  activated() {
+    const orderId = this.$route.query.id;
+    if (orderId != null && orderId != this.orderId) {
+      this.orderId = orderId;
+      this.getDetail();
+      this.getChannelList();
+    }
+  },
   methods: {
     // 盲票组列表
     getChannelList(row) {
@@ -254,4 +262,4 @@ export default {
     margin-left: 20px;
   }
 }
-</style>
+</style>

src/views/order/deliver/detail.vue

@@ -189,6 +189,13 @@ export default {
     this.orderId = this.$route.query.id;
     this.getDetail();
   },
+  activated() {
+    const orderId = this.$route.query.id;
+    if (orderId != null && orderId != this.orderId) {
+      this.orderId = orderId;
+      this.getDetail();
+    }
+  },
   methods: {
     // 订单详情
     getDetail() {
@@ -312,4 +319,4 @@ export default {
     margin-left: 20px;
   }
 }
-</style>
+</style>