wangliang_wd

feat:优化我的收藏

@@ -66,15 +66,16 @@ struct MyCollectionListPage { @@ -66,15 +66,16 @@ struct MyCollectionListPage {
66 } 66 }
67 67
68 if (this.isEditState){ 68 if (this.isEditState){
69 - CustomBottomFuctionUI({  
70 - selectAllCallback:(isAllSelect)=>{  
71 - this.allSelectDatas(isAllSelect)  
72 - },  
73 - confirmCallback:()=>{  
74 - this.deleteDatas()  
75 - }  
76 - })  
77 - .position({y:'92%'}) 69 + Stack(){
  70 + CustomBottomFuctionUI({
  71 + selectAllCallback:(isAllSelect)=>{
  72 + this.allSelectDatas(isAllSelect)
  73 + },
  74 + confirmCallback:()=>{
  75 + this.deleteDatas()
  76 + }
  77 + })
  78 + }.position({y:'92%'})
78 } 79 }
79 } 80 }
80 .width(CommonConstants.FULL_WIDTH) 81 .width(CommonConstants.FULL_WIDTH)
@@ -119,15 +120,21 @@ struct MyCollectionListPage { @@ -119,15 +120,21 @@ struct MyCollectionListPage {
119 MyCollectionViewModel.fetchMyCollectList(1,'1',this.currentPage,getContext(this)).then(collectionItem => { 120 MyCollectionViewModel.fetchMyCollectList(1,'1',this.currentPage,getContext(this)).then(collectionItem => {
120 if(resolve) resolve('刷新成功') 121 if(resolve) resolve('刷新成功')
121 if (collectionItem && collectionItem.list && collectionItem.list.length > 0) { 122 if (collectionItem && collectionItem.list && collectionItem.list.length > 0) {
122 - if (this.currentPage === 1) this.allDatas = []  
123 - this.allDatas = this.allDatas.concat(...collectionItem.list)  
124 - if (collectionItem.totalCount === this.allDatas.length) { 123 + if (this.currentPage === 1) {
  124 + this.allDatas = []
  125 + this.allDatas.push(...collectionItem.list)
  126 + }else {
  127 + this.allDatas = this.allDatas.concat(...collectionItem.list)
  128 + }
  129 + if (collectionItem.hasNext === 0) {
125 this.browSingModel.hasMore = false; 130 this.browSingModel.hasMore = false;
126 } else { 131 } else {
127 this.browSingModel.hasMore = true; 132 this.browSingModel.hasMore = true;
128 } 133 }
129 } else { 134 } else {
130 - this.browSingModel.viewType = ViewType.EMPTY; 135 + if (this.currentPage === 1) {
  136 + this.browSingModel.viewType = ViewType.EMPTY;
  137 + }
131 } 138 }
132 }) 139 })
133 } 140 }