bug

nova-tourism/components/collect/index.wxml

@@ -69,7 +69,7 @@
         <van-tab title="我的收藏">
             <!-- 卡片 -->
             <view class="Legendary-Information" wx:if="{{storeList.length!=0}}">
-                <block wx:for="{{storeList}}" wx:if="{{item.isCollect}}">
+                <block wx:for="{{storeList}}" wx:if="{{item.isCollect&&item.homestayStore.isShow}}">
                     <view class="cardbox">
                         <image class="pic" src="{{item.homestayStore.cover}}" data-id="{{item.homestayStore.objectId}}" data-url="../../pages/homestay/homestay-detail/index" bindtap="gourl"></image>
                         <view class="textobx">

nova-tourism/components/homestay/index.js

@@ -35,7 +35,7 @@ Component({
 
         //触底加载
         loadedItems: 0,
-        pageSize: 3,
+        pageSize: 5,
         noMoreItems: false,
 
     },
@@ -166,38 +166,32 @@ Component({
         async gethomestar() {
           let _data = await getStores({
             uid:Parse.User.current().id,
-            skip:0,
-            limit:10
-          })
-          console.log('店铺数据=====>',_data);
-            let ShopStore = new Parse.Query('ShopStore');
-            ShopStore.equalTo('company', company);
-            ShopStore.equalTo('type', "stay");
-            ShopStore.notEqualTo('isDeleted', "true");
-            ShopStore.limit(this.data.pageSize);
-            ShopStore.skip(this.data.loadedItems);
-            let store = await ShopStore.find();
+            skip:this.data.loadedItems,
+            limit:this.data.pageSize
+          });
+            // let ShopStore = new Parse.Query('ShopStore');
+            // ShopStore.equalTo('company', company);
+            // ShopStore.equalTo('type', "stay");
+            // ShopStore.equalTo('isShow', true);
+            // ShopStore.notEqualTo('isDeleted', "true");
+            // ShopStore.limit(this.data.pageSize);
+            // ShopStore.skip(this.data.loadedItems);
+            // let store = await ShopStore.find();
 
-            let storeListPromises = store.map(async item => {
-                let storeItem = item.toJSON();
-                // 为每一项添加价格属性
-                storeItem.price = storeItem.perCapita * this.data.daysBetween;
-                storeItem.iscollect = await this.iscollect(storeItem.objectId); // 等待iscollect的结果
-                return storeItem;
-            });
+            // let storeListPromises = store.map(async item => {
+            //     let storeItem = item.toJSON();
+            //     // 为每一项添加价格属性
+            //     storeItem.price = storeItem.perCapita * this.data.daysBetween;
+            //     storeItem.iscollect = await this.iscollect(storeItem.objectId); // 等待iscollect的结果
+            //     return storeItem;
+            // });
 
-            let storeList = await Promise.all(storeListPromises); // 等待所有的Promise完成
+            // let storeList = await Promise.all(storeListPromises); // 等待所有的Promise完成
             
-            // 收藏提前-----------------------
             // 合并新加载的商店和已存在的商店列表
-            let updatedStoreList = this.data.storeList.concat(storeList);
+            // let updatedStoreList = this.data.storeList.concat(storeList);
 
-            // 按照iscollect排序，true的排在前面
-            updatedStoreList.sort((a, b) => {
-                return (b.iscollect === true) - (a.iscollect === true);
-            });
-            // 收藏提前-----------------------
-            if (storeList.length < this.data.pageSize) {
+            if (_data.length < this.data.pageSize) {
                 this.setData({
                     noMoreItems: true
                 });
@@ -208,27 +202,11 @@ Component({
             }
 
             this.setData({
-                storeList: updatedStoreList,//storeList: this.data.storeList.concat(storeList),
-                loadedItems: this.data.loadedItems + storeList.length,//loadedItems: this.data.loadedItems + storeList.length,
+                storeList: this.data.storeList.concat(_data),
+                loadedItems: this.data.loadedItems + _data.length,
             });
 
-            console.log(this.data.storeList);
-        },
-        //收藏功能
-        async iscollect(object) {
-            const currentUser = Parse.User.current();
-            let Collect = new Parse.Query('DramaShopCollect');
-            Collect.equalTo('company', company);
-            Collect.equalTo('user', currentUser.id);
-            Collect.equalTo('homestayStore', object);
-            Collect.equalTo('isCollect', 'true');
-            Collect.notEqualTo('isDeleted', "true");
-            let collect = await Collect.first();
-            if (collect) {
-                return true
-            } else {
-                return false
-            }
+            console.log('店铺数据=====>',this.data.storeList);
         },
         //点击收藏
         async submit(e) {

nova-tourism/service/request.js

@@ -26,6 +26,7 @@ async function getStores(params) {
   FROM "ShopStore" store
   WHERE "company" = '${company}'
   AND "type" = 'stay'
+  AND "isShow" = 'true'
   AND "isDeleted" IS NOT TRUE
   ORDER BY "iscollect"
   OFFSET ${skip ?? 0} LIMIT ${limit ?? 10}`