From c0e56f82eab917dcb2c29166c442eded4d21efd9 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 31 May 2023 15:23:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BA=97=E9=93=BA=E4=BA=91?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/store/home/index.vue | 41 +++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index d72bac1..232b5dd 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -525,7 +525,7 @@
           order: '',
           keyword: '',
           page: 1,
-          limit: 30
+          limit: 10
         },
         // 下拉菜单
         select: {
@@ -768,11 +768,34 @@
       }).exec();
     },
     methods: {
-      async getProductSpu() {
-        console.log('获取云仓商品', this.id);
-        const { data } = await getProductSpuAPI(this.id)
-        this.goods = data.list
-        console.log('data', data);
+      getProductSpu() {
+		let that = this;
+		if (that.loadend) return;
+		if (that.loading) return;
+		if (that.goodsLoading) return;
+		that.goodsLoading = true;
+		that.loadTitle = '';
+		getProductSpuAPI(that.id, that.where).then(res => {
+		  that.goodsLoading = false;
+		  let list = res.data.list;
+		  let goodsList = that.$util.SplitArray(list, that.goods);
+		  let loadend = list.length < that.where.limit;
+		  that.loadend = loadend;
+		  that.loading = false;
+		  that.loadTitle = loadend ? '已全部加载' : '加载更多';
+		  that.$set(that, 'goods', goodsList);
+		  that.$set(that.where, 'page', that.where.page + 1);
+		}).catch(err => {
+		  that.loading = false;
+		  that.goodsLoading = false;
+		  uni.showToast({
+			title: err,
+			icon: 'none'
+		  })
+		  setTimeout(function() {
+			uni.navigateBack()
+		  }, 1000);
+		});
       },
       //#ifndef H5
       call: function() {
@@ -788,7 +811,11 @@
         const query = uni.createSelectorQuery().in(this);
         query.select('#goods').boundingClientRect(data => {
           if (data.bottom < 1500 && data.top < 0) {
-            this.getGoods();
+			  if (this.tabActive == 7) {
+				  this.getProductSpu()
+			  } else {
+				  this.getGoods();
+			  }
           }
         }).exec();
         // 模拟触底刷新