Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool
Showing
2 changed files
with
9 additions
and
6 deletions
| @@ -37,6 +37,7 @@ export struct CardParser { | @@ -37,6 +37,7 @@ export struct CardParser { | ||
| 37 | pageShowTime: number = 0; | 37 | pageShowTime: number = 0; |
| 38 | pageHideTime: number = 0; | 38 | pageHideTime: number = 0; |
| 39 | isPeopleShipHome: boolean = false; | 39 | isPeopleShipHome: boolean = false; |
| 40 | + isNeedDivider:boolean = true | ||
| 40 | 41 | ||
| 41 | aboutToAppear(): void { | 42 | aboutToAppear(): void { |
| 42 | console.log('CardParser-', JSON.stringify(this.contentDTO)) | 43 | console.log('CardParser-', JSON.stringify(this.contentDTO)) |
| @@ -66,11 +67,13 @@ export struct CardParser { | @@ -66,11 +67,13 @@ export struct CardParser { | ||
| 66 | 67 | ||
| 67 | @Builder | 68 | @Builder |
| 68 | getBehindDivider() { | 69 | getBehindDivider() { |
| 69 | - behindDivider({ | ||
| 70 | - compDTO: this.compDTO, | ||
| 71 | - nextCompDTO: this.nextCompDTO, | ||
| 72 | - compIndex: this.compIndex | ||
| 73 | - }) | 70 | + if(this.isNeedDivider){ |
| 71 | + behindDivider({ | ||
| 72 | + compDTO: this.compDTO, | ||
| 73 | + nextCompDTO: this.nextCompDTO, | ||
| 74 | + compIndex: this.compIndex | ||
| 75 | + }) | ||
| 76 | + } | ||
| 74 | } | 77 | } |
| 75 | 78 | ||
| 76 | @Builder | 79 | @Builder |
| @@ -29,7 +29,7 @@ export struct RecommendList { | @@ -29,7 +29,7 @@ export struct RecommendList { | ||
| 29 | } | 29 | } |
| 30 | ForEach(this.recommendList, (item: ContentDTO, index: number) => { | 30 | ForEach(this.recommendList, (item: ContentDTO, index: number) => { |
| 31 | Row() { | 31 | Row() { |
| 32 | - CardParser({ compDTO:new CompDTO,contentDTO: item }); | 32 | + CardParser({ compDTO:new CompDTO,contentDTO: item ,isNeedDivider:false}); |
| 33 | }.padding({ left: 6, right: 6 }) | 33 | }.padding({ left: 6, right: 6 }) |
| 34 | if (this.recommendList.length !== index + 1) { | 34 | if (this.recommendList.length !== index + 1) { |
| 35 | Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) | 35 | Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) |
-
Please register or login to post a comment