zhanglun_wd

Merge remote-tracking branch 'origin/main' into main

@@ -30,14 +30,15 @@ export struct MoreComponent { @@ -30,14 +30,15 @@ export struct MoreComponent {
30 Card9Component({ compDTO: new CompDTO, contentDTO:item, pageId: "", pageName: "" }) 30 Card9Component({ compDTO: new CompDTO, contentDTO:item, pageId: "", pageName: "" })
31 } 31 }
32 }) 32 })
  33 +
  34 + Divider()
  35 + .width('100%')
  36 + .color($r('app.color.color_F5F5F5'))
  37 + .strokeWidth(4)
  38 +
33 } else { 39 } else {
34 Column() { 40 Column() {
35 41
36 - Divider()  
37 - .width('100%')  
38 - .color($r('app.color.color_F5F5F5'))  
39 - .strokeWidth(5)  
40 -  
41 Row() { 42 Row() {
42 Text('点击展开更多相似') 43 Text('点击展开更多相似')
43 .fontSize(16) 44 .fontSize(16)
@@ -34,7 +34,7 @@ export struct SearchContentComponent { @@ -34,7 +34,7 @@ export struct SearchContentComponent {
34 } 34 }
35 35
36 titleInit() { 36 titleInit() {
37 - const titleInitRes:titleInitRes = SearchShowRed.titleInit(this.contentDTO.title); 37 + const titleInitRes:titleInitRes = SearchShowRed.titleInit(this.contentDTO.contentText || '');
38 // this.titleMarked = titleInitRes.titleMarked; 38 // this.titleMarked = titleInitRes.titleMarked;
39 this.textArr = titleInitRes.textArr; 39 this.textArr = titleInitRes.textArr;
40 } 40 }
@@ -291,6 +291,12 @@ export struct SearchResultContentComponent { @@ -291,6 +291,12 @@ export struct SearchResultContentComponent {
291 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 291 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
292 } 292 }
293 } else { 293 } else {
  294 + if(this.data.get(index + 1).sameContentListSize > 0) {
  295 + Divider()
  296 + .width('100%')
  297 + .color($r('app.color.color_F5F5F5'))
  298 + .strokeWidth(4)
  299 + }
294 CardParser({compDTO:new CompDTO, contentDTO: item }) 300 CardParser({compDTO:new CompDTO, contentDTO: item })
295 } 301 }
296 if (index != this.data.totalCount() - 1) { 302 if (index != this.data.totalCount() - 1) {