Browse Source

修改分页

YY 2 năm trước cách đây
mục cha
commit
ac5c301410
39 tập tin đã thay đổi với 62 bổ sung58 xóa
  1. 1 1
      src/views/dev/role/index.vue
  2. 1 1
      src/views/index.vue
  3. 1 1
      src/views/platActivi/act/goods.vue
  4. 1 1
      src/views/platActivi/act/goodsDetail.vue
  5. 2 2
      src/views/platActivi/act/index.vue
  6. 1 1
      src/views/platActivi/actTags/index.vue
  7. 1 1
      src/views/platActivi/coupon/index.vue
  8. 1 1
      src/views/platSettings/banner/index.vue
  9. 1 1
      src/views/platSettings/indexModule/index.vue
  10. 2 3
      src/views/platSettings/service/index.vue
  11. 1 1
      src/views/platfinance/bill/index.vue
  12. 1 1
      src/views/platfinance/statistics/parts/card-1.vue
  13. 1 1
      src/views/platfinance/statistics/parts/card-2.vue
  14. 1 1
      src/views/platfinance/statistics/parts/card-3.vue
  15. 1 1
      src/views/platfinance/statistics/parts/card-4.vue
  16. 1 1
      src/views/platfinance/statistics/parts/card-5.vue
  17. 1 1
      src/views/platfinance/statistics/parts/card-6.vue
  18. 1 3
      src/views/platmanag/goods/index.vue
  19. 10 4
      src/views/platmanag/goodsRate/detail.vue
  20. 1 1
      src/views/platmanag/goodsRate/index.vue
  21. 1 2
      src/views/platmanag/goodsTags/index.vue
  22. 1 1
      src/views/platmanag/order/parts/card-1.vue
  23. 1 1
      src/views/platmanag/order/parts/card-2.vue
  24. 1 1
      src/views/platmanag/order/parts/card-3.vue
  25. 1 1
      src/views/platmanag/order/parts/card-4.vue
  26. 1 2
      src/views/platmanag/storeAcc/detail.vue
  27. 1 3
      src/views/platmanag/storeAcc/index.vue
  28. 1 1
      src/views/selfShop/bill/index.vue
  29. 1 3
      src/views/selfShop/goods/index.vue
  30. 10 4
      src/views/selfShop/goodsRate/detail.vue
  31. 1 1
      src/views/selfShop/goodsRate/index.vue
  32. 1 1
      src/views/selfShop/order/parts/card-1.vue
  33. 1 1
      src/views/selfShop/order/parts/card-3.vue
  34. 1 1
      src/views/selfShop/order/parts/card-4.vue
  35. 1 1
      src/views/selfShop/order/parts/parts/detail-1.vue
  36. 1 1
      src/views/selfShop/sales/index.vue
  37. 1 3
      src/views/zr/zrGoods/index.vue
  38. 1 1
      src/views/zr/zrOrder/parts/detail-1.vue
  39. 4 1
      vue.config.js

+ 1 - 1
src/views/dev/role/index.vue

@@ -87,7 +87,7 @@ export default {
     // ...sysdictdata({ sQuery: 'query' }),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       const condition = _.cloneDeep(this.searchForm);
       let res = await this.query({ skip, limit, ...condition, ...info });
       if (this.$checkRes(res)) {

+ 1 - 1
src/views/index.vue

@@ -107,7 +107,7 @@ export default {
   },
   methods: {
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       // info.shop = this.user.shop.id;
       let res = await this.query({ skip, limit, ...info });
       if (this.$checkRes(res)) {

+ 1 - 1
src/views/platActivi/act/goods.vue

@@ -77,7 +77,7 @@ export default {
     ...dictData({ dictQuery: 'query' }),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0,limit = this.$limit, ...info } = {}) {
       const condition = _.cloneDeep(this.searchForm);
       let res = await this.query({ skip, limit, ...condition, ...info });
       if (this.$checkRes(res)) {

+ 1 - 1
src/views/platActivi/act/goodsDetail.vue

@@ -65,7 +65,7 @@ export default {
     ...dictData({ dictQuery: 'query' }),
     ...goods({ gQuery: 'query' }),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       if (this.goods) info.name = this.goods;
       let res = await this.gQuery({ skip, limit, ...info });
       if (this.$checkRes(res)) {

+ 2 - 2
src/views/platActivi/act/index.vue

@@ -91,7 +91,7 @@ export default {
     ...dictData({ dictQuery: 'query' }),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       const condition = _.cloneDeep(this.searchForm);
       let res = await this.query({ skip, limit, ...condition, ...info });
       if (this.$checkRes(res)) {
@@ -154,7 +154,7 @@ export default {
     test: {
       deep: true,
       immediate: true,
-      handler(val) { },
+      handler(val) {},
     },
   },
 };

+ 1 - 1
src/views/platActivi/actTags/index.vue

@@ -90,7 +90,7 @@ export default {
     ...dictData({ dictQuery: 'query' }),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       const condition = _.cloneDeep(this.searchForm);
       let res = await this.query({ skip, limit, ...condition, ...info });
       if (this.$checkRes(res)) {

+ 1 - 1
src/views/platActivi/coupon/index.vue

@@ -112,7 +112,7 @@ export default {
     ...dictData({ dictQuery: 'query' }),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       let condition = _.cloneDeep(this.searchForm);
       let res = await this.query({ skip, limit, ...condition, ...info });
       if (this.$checkRes(res)) {

+ 1 - 1
src/views/platSettings/banner/index.vue

@@ -90,7 +90,7 @@ export default {
     ...dictData({ dictQuery: 'query' }),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0,limit = this.$limit, ...info } = {}) {
       const condition = _.cloneDeep(this.searchForm);
       let res = await this.query({ skip, limit, ...condition, ...info });
       if (this.$checkRes(res)) {

+ 1 - 1
src/views/platSettings/indexModule/index.vue

@@ -90,7 +90,7 @@ export default {
     ...dictData({ dictQuery: 'query' }),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0,limit = this.$limit, ...info } = {}) {
       const condition = _.cloneDeep(this.searchForm);
       let res = await this.query({ skip, limit, ...condition, ...info });
       if (this.$checkRes(res)) {

+ 2 - 3
src/views/platSettings/service/index.vue

@@ -2,7 +2,7 @@
   <div id="goods">
     <el-col :span="24" class="one"> <span>客服</span> </el-col>
     <template v-if="view === 'list'">
-      <data-table ref="dataTable" :fields="fields" :opera="opera" :data="list" :total="total" :limit="limit" @query="search" @edit="toEdit"></data-table>
+      <data-table ref="dataTable" :fields="fields" :opera="opera" :data="list" :total="total" @query="search" @edit="toEdit"></data-table>
     </template>
     <template v-else>
       <el-row>
@@ -38,7 +38,6 @@ export default {
       opera: [{ label: '修改', method: 'edit' }],
       list: [],
       total: 0,
-      limit: 10,
       // info部分
       infoFields: [
         { label: '联系电话', model: 'phone' },
@@ -57,7 +56,7 @@ export default {
   methods: {
     ...mapActions(['query', 'delete', 'fetch', 'update', 'create']),
     ...methodsUtil,
-    async search({ skip = 0, limit = this.limit, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       const res = await this.query({ skip, limit, ...info });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);

+ 1 - 1
src/views/platfinance/bill/index.vue

@@ -82,7 +82,7 @@ export default {
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     ...outBill({ outQuery: 'query', outCreate: 'create' }),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       let condition = _.cloneDeep(this.searchForm);
       if (condition.buy_time && condition.shop) {
         condition[`start`] = _.head(condition.buy_time);

+ 1 - 1
src/views/platfinance/statistics/parts/card-1.vue

@@ -52,7 +52,7 @@ export default {
   async created() {},
   methods: {
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       let res = await this.query({ skip, limit, type: info.time, start: info.start, end: info.end });
       if (this.$checkRes(res)) {
         let list = res.data;

+ 1 - 1
src/views/platfinance/statistics/parts/card-2.vue

@@ -52,7 +52,7 @@ export default {
   async created() {},
   methods: {
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       let res = await this.query({ skip, limit, status: '1', type: info.time, start: info.start, end: info.end });
       if (this.$checkRes(res)) {
         let list = res.data.sMarkOrder;

+ 1 - 1
src/views/platfinance/statistics/parts/card-3.vue

@@ -52,7 +52,7 @@ export default {
   async created() {},
   methods: {
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       let res = await this.query({ skip, limit, status: '1', type: info.time, start: info.start, end: info.end });
       if (this.$checkRes(res)) {
         let list = res.data.sMarkOrder;

+ 1 - 1
src/views/platfinance/statistics/parts/card-4.vue

@@ -52,7 +52,7 @@ export default {
   async created() {},
   methods: {
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       let res = await this.query({ skip, limit, status: '-2', type: info.time, start: info.start, end: info.end });
       if (this.$checkRes(res)) {
         let list = res.data.sAfterSale;

+ 1 - 1
src/views/platfinance/statistics/parts/card-5.vue

@@ -52,7 +52,7 @@ export default {
   async created() {},
   methods: {
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       let res = await this.query({ skip, limit, status: '-1', type: info.time, start: info.start, end: info.end });
       if (this.$checkRes(res)) {
         let list = res.data.sAfterSale;

+ 1 - 1
src/views/platfinance/statistics/parts/card-6.vue

@@ -54,7 +54,7 @@ export default {
   async created() {},
   methods: {
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       let res = await this.query({ skip, limit, status: '-3', type: info.time, start: info.start, end: info.end });
       if (this.$checkRes(res)) {
         let list = res.data.sAfterSale;

+ 1 - 3
src/views/platmanag/goods/index.vue

@@ -18,7 +18,6 @@
         :opera="opera"
         :data="list"
         :total="total"
-        :limit="limit"
         @query="search"
         @edit="toEdit"
         @puton="toPuton"
@@ -129,7 +128,6 @@ export default {
       searchInfo: {},
       list: [],
       total: 0,
-      limit: 50,
       // info部分
       infoFields: [
         { label: '商铺名称', model: 'shop', custom: true },
@@ -182,7 +180,7 @@ export default {
     ...goods(['copy', 'query', 'delete', 'fetch', 'update', 'create']),
     ...methodsUtil,
     // 查询
-    async search({ skip = 0, limit = this.limit, ...others } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...others } = {}) {
       let query = { skip, limit, ...others };
       if (Object.keys(this.searchInfo).length > 0) query = { ...query, ...this.searchInfo };
       const res = await this.query(query);

+ 10 - 4
src/views/platmanag/goodsRate/detail.vue

@@ -46,11 +46,13 @@
           </el-col>
           <el-col :span="24" class="pag">
             <el-pagination
+              background
+              @size-change="handleCurrentChange"
               @current-change="currentChange"
               :current-page.sync="skip"
+              :page-sizes="[10, 50, 100, 150, 200]"
               :page-size="limit"
-              background
-              layout="total, prev, pager, next"
+              layout="sizes,total, prev, pager, next"
               :total="total"
             >
             </el-pagination>
@@ -77,7 +79,7 @@ export default {
       goods: {},
       skip: 1,
       total: 0,
-      limit: 5,
+      limit: 50,
       // 评分颜色
       colors: ['#99A9BF', '#F7BA2A', '#FF0000'],
     };
@@ -88,7 +90,7 @@ export default {
   methods: {
     ...mapActions(['query', 'fetch', 'create', 'update']),
     // 查询
-    async search({ skip = 0, limit = 5, ...info } = {}) {
+    async search({ skip = 0, limit = this.limit, ...info } = {}) {
       info.goods = this.id;
       let res;
       res = await this.query({ skip, limit, ...info });
@@ -112,6 +114,10 @@ export default {
     currentChange(val) {
       this.search({ skip: (val - 1) * this.limit });
     },
+    handleCurrentChange(val) {
+      this.$set(this, 'limit', val);
+      this.search();
+    },
     // 返回
     toBack() {
       window.history.go('-1');

+ 1 - 1
src/views/platmanag/goodsRate/index.vue

@@ -61,7 +61,7 @@ export default {
   methods: {
     ...dictData({ getDict: 'query' }),
     ...goods(['query', 'delete', 'fetch', 'update', 'create']),
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       let condition = _.cloneDeep(this.searchForm);
       let res = await this.query({ skip, limit, ...condition, ...info });
       if (this.$checkRes(res)) {

+ 1 - 2
src/views/platmanag/goodsTags/index.vue

@@ -67,7 +67,6 @@ export default {
       ],
       list: [],
       total: 0,
-      limit: 10,
       btnFields: [{ label: '添加', method: 'add' }],
       defaultSearch: {},
       searchInfo: {},
@@ -104,7 +103,7 @@ export default {
     ...dictData({ getDict: 'query' }),
     ..._.cloneDeep(methodUtil),
     //执行查询
-    async search({ skip = 0, limit = this.limit || 10, ...others } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...others } = {}) {
       let query = { skip, limit, ...others };
       if (this.searchInfo && Object.keys(this.searchInfo).length > 0) query = { ...query, ...this.searchInfo };
       if (this.defaultSearch && Object.keys(this.defaultSearch).length > 0) query = { ...query, ...this.defaultSearch };

+ 1 - 1
src/views/platmanag/order/parts/card-1.vue

@@ -57,7 +57,7 @@ export default {
     ...shop({ shopQuery: 'query' }),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       let condition = _.cloneDeep(this.searchForm);
       if (condition.buy_time) {
         condition[`buy_time@start`] = _.head(condition.buy_time);

+ 1 - 1
src/views/platmanag/order/parts/card-2.vue

@@ -59,7 +59,7 @@ export default {
     ...shop({ shopQuery: 'query' }),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       let condition = _.cloneDeep(this.searchForm);
       if (condition.buy_time) {
         condition[`buy_time@start`] = _.head(condition.buy_time);

+ 1 - 1
src/views/platmanag/order/parts/card-3.vue

@@ -59,7 +59,7 @@ export default {
     ...shop({ shopQuery: 'query' }),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0,limit = this.$limit, ...info } = {}) {
       let condition = _.cloneDeep(this.searchForm);
       if (condition.buy_time) {
         condition[`buy_time@start`] = _.head(condition.buy_time);

+ 1 - 1
src/views/platmanag/order/parts/card-4.vue

@@ -59,7 +59,7 @@ export default {
     ...shop({ shopQuery: 'query' }),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0,limit = this.$limit, ...info } = {}) {
       let condition = _.cloneDeep(this.searchForm);
       if (condition.buy_time) {
         condition[`buy_time@start`] = _.head(condition.buy_time);

+ 1 - 2
src/views/platmanag/storeAcc/detail.vue

@@ -14,7 +14,6 @@
         :opera="opera"
         :data="list"
         :total="total"
-        :limit="limit"
         @query="search"
         @edit="toEdit"
         @del="toDel"
@@ -95,7 +94,7 @@ export default {
     ...emailResetPwd({ pwdCreate: 'create' }),
     ...admins(['query', 'delete', 'fetch', 'update', 'create', 'email']),
     // 重置
-    async search({ skip = 0, limit = this.limit, ...others } = {}) {
+    async search({ skip = 0,limit = this.$limit, ...others } = {}) {
       others.shop = this.id;
       let query = { skip, limit, ...others };
       if (Object.keys(this.searchInfo).length > 0) query = { ...query, ...this.searchInfo };

+ 1 - 3
src/views/platmanag/storeAcc/index.vue

@@ -10,7 +10,6 @@
         :opera="opera"
         :data="list"
         :total="total"
-        :limit="limit"
         @query="search"
         @manage="toManage"
         @edit="toEdit"
@@ -71,7 +70,6 @@ export default {
       searchInfo: {},
       list: [],
       total: 0,
-      limit: 10,
       // info部分
       infoFields: [
         { label: '店铺名称', model: 'name' },
@@ -97,7 +95,7 @@ export default {
     ...methodsUtil,
     ...dictData({ getDict: 'query' }),
     ...shop(['query', 'delete', 'fetch', 'update', 'create']),
-    async search({ skip = 0, limit = this.limit, ...others } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...others } = {}) {
       let query = { skip, limit, ...others };
       if (Object.keys(this.searchInfo).length > 0) query = { ...query, ...this.searchInfo };
       const res = await this.query(query);

+ 1 - 1
src/views/selfShop/bill/index.vue

@@ -74,7 +74,7 @@ export default {
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     ...outBill({ outQuery: 'query', outCreate: 'create' }),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0,limit = this.$limit, ...info } = {}) {
       let condition = _.cloneDeep(this.searchForm);
       if (condition.buy_time) {
         condition[`start`] = _.head(condition.buy_time);

+ 1 - 3
src/views/selfShop/goods/index.vue

@@ -24,7 +24,6 @@
         :opera="opera"
         :data="list"
         :total="total"
-        :limit="limit"
         @query="search"
         @edit="toEdit"
         @puton="toPuton"
@@ -126,7 +125,6 @@ export default {
       searchInfo: {},
       list: [],
       total: 0,
-      limit: 50,
       // info部分
       infoFields: [
         { label: '商品名称', model: 'name' },
@@ -171,7 +169,7 @@ export default {
     ...goods(['copy', 'query', 'delete', 'fetch', 'update', 'create']),
     ...methodsUtil,
     // 查询
-    async search({ skip = 0, limit = this.limit, ...others } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...others } = {}) {
       let query = { skip, limit, ...others, shop: this.user.shop.id };
       if (Object.keys(this.searchInfo).length > 0) query = { ...query, ...this.searchInfo };
       const res = await this.query(query);

+ 10 - 4
src/views/selfShop/goodsRate/detail.vue

@@ -55,11 +55,13 @@
           </el-col>
           <el-col :span="24" class="pag">
             <el-pagination
+              background
+              @size-change="handleCurrentChange"
               @current-change="currentChange"
               :current-page.sync="skip"
+              :page-sizes="[10, 50, 100, 150, 200]"
               :page-size="limit"
-              background
-              layout="total, prev, pager, next"
+              layout="sizes,total, prev, pager, next"
               :total="total"
             >
             </el-pagination>
@@ -86,7 +88,7 @@ export default {
       goods: {},
       skip: 1,
       total: 0,
-      limit: 5,
+      limit: 50,
       // 评分颜色
       colors: ['#99A9BF', '#F7BA2A', '#FF0000'],
     };
@@ -97,7 +99,7 @@ export default {
   methods: {
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 5, ...info } = {}) {
+    async search({ skip = 0, limit = this.limit, ...info } = {}) {
       info.goods = this.id;
       let res;
       res = await this.query({ skip, limit, ...info });
@@ -121,6 +123,10 @@ export default {
     currentChange(val) {
       this.search({ skip: (val - 1) * this.limit });
     },
+    handleCurrentChange(val) {
+      this.$set(this, 'limit', val);
+      this.search();
+    },
     async toSend(item, data) {
       let res;
       if (data.id) res = await this.update(data);

+ 1 - 1
src/views/selfShop/goodsRate/index.vue

@@ -61,7 +61,7 @@ export default {
     ...dictData({ getDict: 'query' }),
     ...goods(['query', 'delete', 'fetch', 'update', 'create']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0,limit = this.$limit, ...info } = {}) {
       let condition = _.cloneDeep(this.searchForm);
       let res = await this.query({ skip, limit, ...condition, ...info, shop: this.user.shop.id });
       if (this.$checkRes(res)) {

+ 1 - 1
src/views/selfShop/order/parts/card-1.vue

@@ -53,7 +53,7 @@ export default {
   methods: {
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0,limit = this.$limit, ...info } = {}) {
       let condition = _.cloneDeep(this.searchForm);
       if (condition.buy_time) {
         condition[`buy_time@start`] = _.head(condition.buy_time);

+ 1 - 1
src/views/selfShop/order/parts/card-3.vue

@@ -56,7 +56,7 @@ export default {
   methods: {
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0,limit = this.$limit, ...info } = {}) {
       let condition = _.cloneDeep(this.searchForm);
       if (condition.buy_time) {
         condition[`buy_time@start`] = _.head(condition.buy_time);

+ 1 - 1
src/views/selfShop/order/parts/card-4.vue

@@ -57,7 +57,7 @@ export default {
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
 
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0,limit = this.$limit, ...info } = {}) {
       let condition = _.cloneDeep(this.searchForm);
       if (condition.buy_time) {
         condition[`buy_time@start`] = _.head(condition.buy_time);

+ 1 - 1
src/views/selfShop/order/parts/parts/detail-1.vue

@@ -69,7 +69,7 @@ export default {
     ...shop({ shopQuery: 'query' }),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       let condition = _.cloneDeep(this.searchForm);
       if (condition.buy_time) {
         condition[`buy_time@start`] = _.head(condition.buy_time);

+ 1 - 1
src/views/selfShop/sales/index.vue

@@ -80,7 +80,7 @@ export default {
     ...dictData({ dictQuery: 'query' }),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       let condition = _.cloneDeep(this.searchForm);
       let res = await this.query({ skip, limit, ...condition, ...info, shop: this.user.shop.id });
       if (this.$checkRes(res)) {

+ 1 - 3
src/views/zr/zrGoods/index.vue

@@ -13,7 +13,6 @@
         :opera="opera"
         :data="list"
         :total="total"
-        :limit="limit"
         @query="search"
         @edit="toEdit"
         @puton="toPuton"
@@ -75,7 +74,6 @@ export default {
       searchInfo: {},
       list: [],
       total: 0,
-      limit: 50,
       // info部分
       infoFields: [
         { label: '商品名称', model: 'name' },
@@ -103,7 +101,7 @@ export default {
     ...zrGoods(['query', 'delete', 'fetch', 'update', 'create']),
     ...methodsUtil,
     // 查询
-    async search({ skip = 0, limit = this.limit, ...others } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...others } = {}) {
       if (this.user.role.code == 'sadmin') {
         others.shop = '';
       } else {

+ 1 - 1
src/views/zr/zrOrder/parts/detail-1.vue

@@ -75,7 +75,7 @@ export default {
     ...shop({ shopQuery: 'query' }),
     ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
     // 查询
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
       let condition = _.cloneDeep(this.searchForm);
       if (condition.buy_time) {
         condition[`buy_time@start`] = _.head(condition.buy_time);

+ 4 - 1
vue.config.js

@@ -25,10 +25,13 @@ module.exports = {
         changeOrigin: true,
         ws: false,
       },
-      '/point/zr/v1/api': {
+      '/dev/point/zr/v1/api': {
         target: 'https://broadcast.waityou24.cn', // 127.0.0.1:13003
         changeOrigin: true,
         ws: false,
+        pathRewrite: {
+          '^/dev/point/zr/v1/api': '/point/zr/v1/api',
+        },
       },
     },
   },