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

@@ -152,7 +152,7 @@ export struct CompParser {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题
       } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题
         //ZhGridLayout02({ compDTO: this.compDTO })
         //ZhGridLayout02({ compDTO: this.compDTO })
         CompNormalTitle({ compDTO: this.compDTO })
         CompNormalTitle({ compDTO: this.compDTO })
-        this.getBehindDivider()
+        // this.getBehindDivider()
       } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Zh_Grid_Layout_02) { //双列流小视频,一行两图卡
       } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Zh_Grid_Layout_02) { //双列流小视频,一行两图卡
 
 
         ZhGridLayout02NewsContent({
         ZhGridLayout02NewsContent({
@@ -161,7 +161,7 @@ export struct CompParser {
           pageId: this.pageId,
           pageId: this.pageId,
           pageName: this.pageName
           pageName: this.pageName
         })
         })
-        this.getBehindDivider()
+        // this.getBehindDivider()
 
 
       } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
         ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })

@@ -260,7 +260,7 @@ export struct PeopleShipMainComponent {
         ListItem() {
         ListItem() {
           Column(){
           Column(){
             CardParser({ compDTO: new CompDTO, contentDTO: item })
             CardParser({ compDTO: new CompDTO, contentDTO: item })
-            Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
+            // Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
           }.width('100%')
           }.width('100%')
 
 
         }.width("100%")
         }.width("100%")

@@ -101,7 +101,7 @@ export struct PeopleShipHomeArticleListComponent {
             Column() {
             Column() {
               CardParser({compDTO:new CompDTO, contentDTO: item , isPeopleShipHome:true})
               CardParser({compDTO:new CompDTO, contentDTO: item , isPeopleShipHome:true})
                 .margin({left: 6, right: 6})
                 .margin({left: 6, right: 6})
-              Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
+              // Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
             }
             }
           }.width("100%")
           }.width("100%")
           .backgroundColor(Color.Transparent)
           .backgroundColor(Color.Transparent)
@@ -300,14 +300,14 @@ export struct PeopleShipHomeArticleListComponent {
         }
         }
         // contentDTO.shareInfo = [self.contentShare.firstObject convertToShareInfo];
         // contentDTO.shareInfo = [self.contentShare.firstObject convertToShareInfo];
         // contentDTO.shareInfo.shareUrl = self.shareUrl;
         // contentDTO.shareInfo.shareUrl = self.shareUrl;
-        if (element.updateTime.length > 0) {
-          contentDTO.publishTime = this.convertPublishTimeWith(element.updateTime);
-        }else if (element.publishTime.length > 0) {
+        if (element.publishTime.length > 0) {
           contentDTO.publishTime = this.convertPublishTimeWith(element.publishTime);
           contentDTO.publishTime = this.convertPublishTimeWith(element.publishTime);
         } else if (element.firstPublishTime.length > 0) {
         } else if (element.firstPublishTime.length > 0) {
           contentDTO.publishTime = this.convertPublishTimeWith(element.firstPublishTime);
           contentDTO.publishTime = this.convertPublishTimeWith(element.firstPublishTime);
         } else if (element.createTime.length > 0) {
         } else if (element.createTime.length > 0) {
           contentDTO.publishTime = this.convertPublishTimeWith(element.createTime);
           contentDTO.publishTime = this.convertPublishTimeWith(element.createTime);
+        } else if (element.updateTime.length > 0) {
+          contentDTO.publishTime = this.convertPublishTimeWith(element.updateTime);
         }
         }
 
 
         //图集数量
         //图集数量