Merge branch 'feature/shop-order' into develop

@@ -13,9 +13,6 @@
       <filter-item label="收货人">
         <Input v-model.trim="query.consigneeName" />
       </filter-item>
-      <filter-item label="商品名称">
-        <Input v-model.trim="query.productName" />
-      </filter-item>
       <filter-item label="订单状态">
         <Select v-model.trim="query.orderStatus" clearable>
           <Option v-for="(option, key) in orderStatusArr" :key="key" :value="key">
@@ -52,7 +49,6 @@ export default {
         orderCode: '',
         productSkn: '',
         productSku: '',
-        prodName: '',
         consigneeName: '',
         orderStatus: '',
         pageSize: 20,
@@ -93,9 +89,7 @@ export default {
       this.query.orderCode = '';
       this.query.productSkn = '';
       this.query.productSku = '';
-      this.query.prodName = '';
-      this.query.nickName = '';
-      this.query.userName = '';
+      this.query.consigneeName = '';
       this.query.orderStatus = '';
       this.query.pageSize = 20;
       this.query.pageNo = 1;

@@ -11,10 +11,7 @@
         <Input v-model.trim="query.productSku" />
       </filter-item>
       <filter-item label="收货人">
-        <Input v-model.trim="query.userName" />
-      </filter-item>
-      <filter-item label="商品名称">
-        <Input v-model.trim="query.prodName" />
+        <Input v-model.trim="query.consigneeName" />
       </filter-item>
       <filter-item label="售后状态">
         <Select v-model.trim="query.shopStatus">
@@ -26,7 +23,7 @@
       </filter-item>
       <filter-item>
         <Button type="primary" @click="search">筛选</Button>
-        <Button @click="reset">清空条件</Button>
+        <Button @click="reset">全部</Button>
       </filter-item>
     </layout-filter>
     <layout-list>
@@ -52,9 +49,7 @@ export default {
         orderCode: '',
         productSkn: '',
         productSku: '',
-        prodName: '',
-        nickName: '',
-        userName: '',
+        consigneeName: '',
         pageSize: 20,
         pageNo: 1,
         queryType: 1,
@@ -90,9 +85,7 @@ export default {
       this.query.orderCode = '';
       this.query.productSkn = '';
       this.query.productSku = '';
-      this.query.prodName = '';
-      this.query.nickName = '';
-      this.query.userName = '';
+      this.query.consigneeName = '';
       this.query.orderStatus = 0;
       this.query.pageSize = 20;
       this.query.pageNo = 1;