|
@@ -177,22 +177,29 @@ Component({
|
|
|
storeItem.iscollect = await this.iscollect(storeItem.objectId); // 等待iscollect的结果
|
|
|
return storeItem;
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
let storeList = await Promise.all(storeListPromises); // 等待所有的Promise完成
|
|
|
- if(storeList.length<this.data.pageSize){
|
|
|
+
|
|
|
+ // 按照iscollect排序,true的排在前面
|
|
|
+ storeList.sort((a, b) => {
|
|
|
+ return (b.iscollect === true) - (a.iscollect === true);
|
|
|
+ });
|
|
|
+
|
|
|
+ if (storeList.length < this.data.pageSize) {
|
|
|
this.setData({
|
|
|
- noMoreItems:true
|
|
|
- })
|
|
|
- }else{
|
|
|
+ noMoreItems: true
|
|
|
+ });
|
|
|
+ } else {
|
|
|
this.setData({
|
|
|
- noMoreItems:false
|
|
|
- })
|
|
|
+ noMoreItems: false
|
|
|
+ });
|
|
|
}
|
|
|
+
|
|
|
this.setData({
|
|
|
- storeList:this.data.storeList.concat(storeList),
|
|
|
- loadedItems:this.data.loadedItems+storeList.length,
|
|
|
+ storeList: this.data.storeList.concat(storeList),
|
|
|
+ loadedItems: this.data.loadedItems + storeList.length,
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
console.log(this.data.storeList);
|
|
|
},
|
|
|
//收藏功能
|