Merge branch 'feature/099_customer_filter' into 'dev'

Feature/099 customer filter

See merge request !5

src/views/ecw/giftManagement/bulkExchange/components/chooseMember.vue

@@ -268,10 +268,16 @@ export default {
       });
     },
     handleGetCityList(id) {
-      let params = {
-        id: id,
-      };
-      getCityList(params).then((res) => {});
+      if (id) {
+        let params = {
+          id: id,
+        };
+        getCityList(params).then((res) => {
+          this.cityList = res.data;
+        });
+      } else {
+        this.cityList = [];
+      }
     },
     handleQuery() {
       this.queryParams.pageNo = 1;

src/views/ecw/giftManagement/index.vue

@@ -321,8 +321,8 @@
     <pagination
       v-show="total > 0"
       :total="total"
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.rows"
       @pagination="getList"
     />
     <!-- 查看 编辑 新增弹窗 -->