Merge branch 'master' of https://gitea.lihaink.cn/mkm/new_shop_app

pages/cloud_warehouse/home/home.vue

@@ -392,6 +392,8 @@
 				if (this.isLoading == -1) return;
 				this.isLoading = 1;
 				getProductslist(this.where).then(res => {
+					this.where.limit = res.data.limit
+					this.where.page = res.data.page
 					uni.stopPullDownRefresh();
 					this.hostProduct = [...this.hostProduct, ...res.data.list];
 					this.isLoading = 0;

pages/cloud_warehouse/specialty/specialty.vue

@@ -306,6 +306,7 @@
           cate_pid: '',
           keyword: '',
           mer_type: 3, //1-里海云仓, 2-云市场, 3-名优特产
+          sale_type: 1, //1-零售, 2-批发
         }
 			}
 		},
@@ -357,7 +358,7 @@
         this.getProductslist(true);
       },
       getCategoryIndexList(){
-        getCategoryIndexList().then(res=>{
+        getCategoryIndexList({mer_type: this.where.mer_type, sale_type: this.where.sale_type}).then(res=>{
           this.store_category = [{
             cate_name: '全部',
             pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0bc7a202404021652194310.png',

pages/whole_sale/index.vue

@@ -689,6 +689,8 @@
 				if (this.isLoading == -1) return;
 				this.isLoading = 1;
 				getProductslist(this.where, true).then(res => {
+					this.where.limit = res.data.limit
+					this.where.page = res.data.page
 					if (stop) uni.stopPullDownRefresh();
 					if (reLoad) this.hostProduct = [];
 					this.hostProduct = [...this.hostProduct, ...res.data.list];