Merge branch 'dev' into 'test'

订单列表重置

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

src/views/order/channel/index.vue

@@ -291,6 +291,7 @@ export default {
         channelId: "",
         status: null,
       };
+      this.state = "null"
       this.tradeTimeArr = [];
       this.getList();
     },

src/views/order/deliver/index.vue

@@ -287,6 +287,7 @@ export default {
         endTime: "",
         status: "",
       };
+      this.state = "no"
       this.tradeTimeArr = [];
       this.getList();
     },