From ac280a5446273569fc936dc3fac59bf63879f8a9 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 12 Apr 2024 10:45:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8D=E4=BC=98?=
 =?UTF-8?q?=E7=89=B9=E4=BA=A7=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud_warehouse/specialty/specialty.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/cloud_warehouse/specialty/specialty.vue b/pages/cloud_warehouse/specialty/specialty.vue
index 914c11f..0ff6caa 100644
--- a/pages/cloud_warehouse/specialty/specialty.vue
+++ b/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',

From c722ebd9b327a807a82dade527c0546895812e75 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 12 Apr 2024 14:19:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=91=E4=BB=93?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E5=92=8C=E6=89=B9=E5=8F=91?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud_warehouse/home/home.vue | 2 ++
 pages/whole_sale/index.vue          | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pages/cloud_warehouse/home/home.vue b/pages/cloud_warehouse/home/home.vue
index 41cb92c..c17c5be 100644
--- a/pages/cloud_warehouse/home/home.vue
+++ b/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;
diff --git a/pages/whole_sale/index.vue b/pages/whole_sale/index.vue
index 5f58043..1013760 100644
--- a/pages/whole_sale/index.vue
+++ b/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];