Merge remote-tracking branch 'origin/main'

liyubing
Commit 5d05dcc3ecd64c33ae10919b44b7d96406c1545f 5d05dcc3 2 parents 85656322 febb119e
Showing 2 changed files with 37 additions and 12 deletions
sight_harmony/features/wdComponent/src/main/ets/components/CompParser.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card10Component.ets
--- a/sight_harmony/features/wdComponent/src/main/ets/components/CompParser.ets
View file @5d05dcc
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/CompParser.ets
View file @5d05dcc
@@ -45,7 +45,9 @@ export struct CompParser {
   aboutToAppear(): void {
-    console.log('CompParser-compDTO', JSON.stringify(this.compDTO))
+
+
+    console.log('CompParser', JSON.stringify(this.compDTO))
     this.pageName = this.pageModel.pageInfo.name
     // 轮播图屏蔽音频类型稿件
     if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
@@ -79,11 +81,13 @@ export struct CompParser {
   @Builder
   componentBuilder() {
+    //CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO:this.compDTO })
+
     if (this.compDTO.operDataList[0]?.objectType !== '3' &&
       this.compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口
       if (this.compDTO.compStyle === CompStyle.Label_03) {
         LabelComponent({ compDTO: this.compDTO })
-          Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
         if (this.compDTO.operDataList.length > this.audioItems.length) {
           ZhCarouselLayout01({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
@@ -100,7 +104,7 @@ export struct CompParser {
         } else {
           HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         }
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) {
         ZhSingleRow02({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
@@ -117,27 +121,38 @@ export struct CompParser {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
         ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
         ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
         // ZhSingleRow05({ compDTO })
         // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) {
         ZhSingleRow06({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
         //头图卡 和comStyle 2相同，
-        Card5Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], titleShowPolicy: this.compDTO.titleShowPolicy, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Card5Component({
+          compDTO: this.compDTO,
+          contentDTO: this.compDTO.operDataList[0],
+          titleShowPolicy: this.compDTO.titleShowPolicy,
+          pageId: this.pageId,
+          pageName: this.pageName
+        })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) {
         // 大图卡
         Card2Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Card_09) {
         //时间链卡
-        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(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if(this.compDTO.compStyle === CompStyle.Card_13){
         Card6Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
@@ -152,8 +167,6 @@ export struct CompParser {
         // ZhSingleColumn05({ compDTO: compDTO })
         // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) {
-        // Divider().strokeWidth(3).color('#ffffff').padding({ left: 0, right: 0 }).margin({ top: -3 })
-        // Divider().strokeWidth(6).color('#f5f5f5')
         ZhSingleColumn09({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告
--- a/sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card10Component.ets
View file @5d05dcc
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card10Component.ets
View file @5d05dcc
@@ -7,6 +7,7 @@ import { Notes } from './notes';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 import { InfomationCardClick } from '../../utils/infomationCardClick'
 import { SearchShowRed, titleInitRes, textItem } from '../../utils/searchShowRed';
+import router from '@ohos.router'
 /**
  * 大专题卡--CompStyle:  10
@@ -23,10 +24,19 @@ export struct Card10Component {
   @ObjectLink compDTO: CompDTO
   @State titleMarked: boolean = false;
   @State textArr: textItem[] = []
+  @State hideDetail: boolean = false;
   async aboutToAppear(): Promise<void> {
     this.titleInit();
     this.loadImg = await onlyWifiLoadImg();
+    this.initHideDetail();
+  }
+
+  initHideDetail() {
+    const curRouter = router.getState().name;
+    if (curRouter === 'MyCollectionListPage') {
+      this.hideDetail = true;
+    }
   }
   titleInit() {
@@ -83,6 +93,7 @@ export struct Card10Component {
       }.alignContent(Alignment.BottomStart)
       // 专题列表--后端返回三个，
+      if (!this.hideDetail) {
         Column() {
           ForEach(this.contentDTO.slideShows, (item: slideShows, index: number) => {
             this.timelineItem(item, index)
@@ -92,10 +103,11 @@ export struct Card10Component {
             }
           })
         }
+      }
       // 底部-查看更多。根据接口返回的isMore判断是否显示查看更多
-      if (this.contentDTO.hasMore == 1) {
+      if (this.contentDTO.hasMore == 1 && !this.hideDetail) {
         Row() {
           Text("查看更多")
             .fontSize($r("app.float.font_size_14"))