Merge remote-tracking branch 'origin/main'

@@ -66,8 +66,7 @@ export struct CardParser {
         Card4Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
         Card4Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_05) {
       } else if (contentDTO.appStyle === CompStyle.Card_05) {
         Card5Component({ compDTO: this.compDTO, contentDTO, titleShowPolicy: this.compDTO.titleShowPolicy, pageId: this.pageId, pageName: this.pageName})
         Card5Component({ compDTO: this.compDTO, contentDTO, titleShowPolicy: this.compDTO.titleShowPolicy, pageId: this.pageId, pageName: this.pageName})
-      } else if (contentDTO.appStyle === CompStyle.Card_06 || contentDTO.appStyle === CompStyle
-        .Card_13) {
+      } else if (contentDTO.appStyle === CompStyle.Card_06 ) {
         Card6Component({ compDTO: this.compDTO, contentDTO: this.contentDTO, pageId: this.pageId, pageName: this.pageName })
         Card6Component({ compDTO: this.compDTO, contentDTO: this.contentDTO, pageId: this.pageId, pageName: this.pageName })
       } else if (contentDTO.appStyle === CompStyle.Card_10) {
       } else if (contentDTO.appStyle === CompStyle.Card_10) {
         Card10Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })
         Card10Component({ compDTO: this.compDTO, contentDTO, pageId: this.pageId, pageName: this.pageName })

@@ -5,6 +5,7 @@ import PageModel from '../viewmodel/PageModel';
 import { CardParser } from './CardParser';
 import { CardParser } from './CardParser';
 import { Card2Component } from './cardview/Card2Component';
 import { Card2Component } from './cardview/Card2Component';
 import { Card9Component } from './cardview/Card9Component';
 import { Card9Component } from './cardview/Card9Component';
+import { Card6Component } from './cardview/Card6Component';
 import { Card5Component } from './cardview/Card5Component';
 import { Card5Component } from './cardview/Card5Component';
 import { AdvCardParser } from './cardViewAdv/AdvCardParser';
 import { AdvCardParser } from './cardViewAdv/AdvCardParser';
 import { ZhCarouselLayout01 } from './compview/ZhCarouselLayout01';
 import { ZhCarouselLayout01 } from './compview/ZhCarouselLayout01';
@@ -71,6 +72,7 @@ export struct CompParser {
 
 
   build() {
   build() {
     Column() {
     Column() {
+     // Text(JSON.stringify(this.compDTO.compStyle))
       this.componentBuilder();
       this.componentBuilder();
     }
     }
   }
   }
@@ -140,6 +142,10 @@ export struct CompParser {
         //时间链卡
         //时间链卡
         Card9Component({ compDTO: this.compDTO, contentDTO:this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
         Card9Component({ compDTO: this.compDTO, contentDTO:this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
+      } else if(this.compDTO.compStyle === CompStyle
+        .Card_13){
+        Card6Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
+        Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
         ZhSingleColumn04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         ZhSingleColumn04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })

@@ -86,9 +86,14 @@ export struct Card10Component {
       Column() {
       Column() {
         ForEach(this.contentDTO.slideShows, (item: slideShows, index: number) => {
         ForEach(this.contentDTO.slideShows, (item: slideShows, index: number) => {
           this.timelineItem(item, index)
           this.timelineItem(item, index)
+          if (index < this.contentDTO.slideShows.length - 1) {
+            // 在不是最后一个元素的情况下添加分隔符
+            Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 0, right: 0 });
+          }
         })
         })
       }
       }
 
 
+
       // 底部-查看更多。根据接口返回的isMore判断是否显示查看更多
       // 底部-查看更多。根据接口返回的isMore判断是否显示查看更多
       if (this.contentDTO.hasMore == 1) {
       if (this.contentDTO.hasMore == 1) {
         Row() {
         Row() {