wangliang_wd

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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix |> 地方精选卡最右侧间距调整
  fix |> 修复从收藏列表进入专题页,收藏没有选中状态
@@ -105,9 +105,8 @@ export struct SpacialTopicPageComponent { @@ -105,9 +105,8 @@ export struct SpacialTopicPageComponent {
105 this.contentDetailData.openComment = Number(this.topicInfo.commentFlag) 105 this.contentDetailData.openComment = Number(this.topicInfo.commentFlag)
106 this.contentDetailData.commentDisplay = Number(this.topicInfo.commentShowFlag) 106 this.contentDetailData.commentDisplay = Number(this.topicInfo.commentShowFlag)
107 this.contentDetailData.newsId = Number(this.topicInfo.topicId) 107 this.contentDetailData.newsId = Number(this.topicInfo.topicId)
108 - this.contentDetailData.newsType = this.topicInfo.topicType  
109 this.contentDetailData.newsTitle = this.topicInfo.title; 108 this.contentDetailData.newsTitle = this.topicInfo.title;
110 - this.contentDetailData.newsType = this.topicInfo.topicType; 109 + this.contentDetailData.newsType = 5;//专题5
111 this.contentDetailData.visitorComment = this.topicInfo.visitorComment; 110 this.contentDetailData.visitorComment = this.topicInfo.visitorComment;
112 111
113 //转换分享数据 112 //转换分享数据
@@ -80,7 +80,7 @@ export struct ZhSingleRow04 { @@ -80,7 +80,7 @@ export struct ZhSingleRow04 {
80 } 80 }
81 ) 81 )
82 .margin({ 82 .margin({
83 - right: index === this.compDTO.operDataList.length - 1 ? 26 : 0, 83 + right: index === this.compDTO.operDataList.length - 1 ? 16 : 0,
84 left: index === 0 ? 16 : 0, 84 left: index === 0 ? 16 : 0,
85 top: 6 85 top: 6
86 }) 86 })