Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

@@ -88,6 +88,7 @@ export struct CardParser {
         pageId: this.pageId,
         pageId: this.pageId,
         pageName: this.pageName
         pageName: this.pageName
       })
       })
+      this.getBehindDivider()
     } else {
     } else {
       if (contentDTO.appStyle === CompStyle.Card_02) {
       if (contentDTO.appStyle === CompStyle.Card_02) {
         Card2Component({
         Card2Component({

@@ -27,14 +27,17 @@ export struct MoreComponent {
         if (item.appStyle !== "9") {
         if (item.appStyle !== "9") {
           CardParser({compDTO:new CompDTO, contentDTO: item })
           CardParser({compDTO:new CompDTO, contentDTO: item })
         } else {
         } else {
+          Column(){
             Card9Component({ compDTO: new CompDTO, contentDTO:item, pageId: "", pageName: "" })
             Card9Component({ compDTO: new CompDTO, contentDTO:item, pageId: "", pageName: "" })
-        }
-      })
 
 
             Divider()
             Divider()
               .width('100%')
               .width('100%')
               .color($r('app.color.color_F5F5F5'))
               .color($r('app.color.color_F5F5F5'))
               .strokeWidth(4)
               .strokeWidth(4)
+          }
+        }
+      })
+
 
 
     } else {
     } else {
       Column() {
       Column() {

@@ -115,13 +115,6 @@ export struct SearchResultComponent {
             ListItem() {
             ListItem() {
               Column() {
               Column() {
                 CardParser({compDTO:new CompDTO,contentDTO:item})
                 CardParser({compDTO:new CompDTO,contentDTO:item})
-                if (index != this.data.totalCount() - 1) {
-                  Divider()
-                    .width('100%')
-                    .height(`${this.calcHeight(1)}lpx`)
-                    .color($r('app.color.color_F5F5F5'))
-                    .strokeWidth(`${this.calcHeight(1)}lpx`)
-                }
               }
               }
             }
             }
           })
           })

@@ -310,18 +310,8 @@ export struct SearchResultContentComponent {
                     Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
                     Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
                   }
                   }
                 } else {
                 } else {
-                  if (this.data?.get(index + 1)?.sameContentListSize > 0 && index !== 0) {
-                    Divider()
-                      .width('100%')
-                      .color($r('app.color.color_F5F5F5'))
-                      .strokeWidth(4)
-                  }
                   CardParser({ compDTO: new CompDTO, contentDTO: item })
                   CardParser({ compDTO: new CompDTO, contentDTO: item })
                 }
                 }
-                if (index != this.data.totalCount() - 1) {
-                  Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
-
-                }
               }
               }
             }
             }
           }, (item: ContentDTO, index: number) => index.toString())
           }, (item: ContentDTO, index: number) => index.toString())