陈剑华

feat: 18453 小视频横滑卡-选择不跳转右滑至卡片结尾不该展示查看更多按钮

@@ -90,7 +90,7 @@ export struct ZhSingleRow02 { @@ -90,7 +90,7 @@ export struct ZhSingleRow02 {
90 .margin({ right: 8 }) 90 .margin({ right: 8 })
91 }) 91 })
92 } 92 }
93 - if (this.compDTO.operDataList.length >= 2) { 93 + if (this.compDTO.operDataList.length >= 2 && (this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
94 Row() { 94 Row() {
95 Ellipse() 95 Ellipse()
96 .width(2* (this.moreWidth - this.initMoreWidth - 1)) 96 .width(2* (this.moreWidth - this.initMoreWidth - 1))
@@ -165,7 +165,7 @@ export struct ZhSingleRow03 { @@ -165,7 +165,7 @@ export struct ZhSingleRow03 {
165 this.ItemCard(item) 165 this.ItemCard(item)
166 }) 166 })
167 } 167 }
168 - if (this.compDTO.operDataList.length >= 2) { 168 + if (this.compDTO.operDataList.length >= 2 && (this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
169 Row() { 169 Row() {
170 Ellipse() 170 Ellipse()
171 .width(2* (this.moreWidth - this.initMoreWidth - 1)) 171 .width(2* (this.moreWidth - this.initMoreWidth - 1))
@@ -401,18 +401,20 @@ export struct ZhSingleRow03 { @@ -401,18 +401,20 @@ export struct ZhSingleRow03 {
401 .fontWeight(600) 401 .fontWeight(600)
402 } 402 }
403 403
404 - Row() {  
405 - Text("更多")  
406 - .fontSize($r("app.float.font_size_14"))  
407 - .fontColor($r("app.color.color_999999"))  
408 - .margin({ right: 1 })  
409 - Image($r("app.media.more"))  
410 - .width(14)  
411 - .height(14) 404 + if (this.compDTO?.objectType === '0' || this.compDTO?.objectType === '') {
  405 + Row() {
  406 + Text("更多")
  407 + .fontSize($r("app.float.font_size_14"))
  408 + .fontColor($r("app.color.color_999999"))
  409 + .margin({ right: 1 })
  410 + Image($r("app.media.more"))
  411 + .width(14)
  412 + .height(14)
  413 + }
  414 + .onClick(() => {
  415 + this.jumpToMore();
  416 + })
412 } 417 }
413 - .onClick(() => {  
414 - this.jumpToMore();  
415 - })  
416 } 418 }
417 .justifyContent(FlexAlign.SpaceBetween) 419 .justifyContent(FlexAlign.SpaceBetween)
418 .margin({ top: 8, bottom: 8 }) 420 .margin({ top: 8, bottom: 8 })
@@ -141,7 +141,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -141,7 +141,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
141 }) 141 })
142 } 142 }
143 143
144 - if (this.compDTO.operDataList.length >= 2) { 144 + if (this.compDTO.operDataList.length >= 2 && (this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
145 Row() { 145 Row() {
146 Ellipse() 146 Ellipse()
147 .width(2* (this.moreWidth - this.initMoreWidth - 1)) 147 .width(2* (this.moreWidth - this.initMoreWidth - 1))
@@ -93,7 +93,7 @@ export struct LiveHorizontalCardComponent { @@ -93,7 +93,7 @@ export struct LiveHorizontalCardComponent {
93 .fontWeight(600) 93 .fontWeight(600)
94 } 94 }
95 95
96 - if (this.compDTO.dataSourceType === 'LIVE_HORIZONTAL_CARD' || this.compDTO.dataSourceType === 'LIVE_MONTHLY_RANKING' || this.compDTO.dataSourceType === 'OBJECT_POS') { 96 + if (this.compDTO?.objectType === '0' || this.compDTO?.objectType === '') {
97 Row() { 97 Row() {
98 Text("更多") 98 Text("更多")
99 .fontSize($r("app.float.font_size_14")) 99 .fontSize($r("app.float.font_size_14"))
@@ -164,7 +164,7 @@ export struct LiveHorizontalCardComponent { @@ -164,7 +164,7 @@ export struct LiveHorizontalCardComponent {
164 }) 164 })
165 }) 165 })
166 } 166 }
167 - if (this.compDTO.operDataList.length >= 2) { 167 + if (this.compDTO.operDataList.length >= 2 && (this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')) {
168 Row() { 168 Row() {
169 Ellipse() 169 Ellipse()
170 .width(2* (this.moreWidth - this.initMoreWidth - 1)) 170 .width(2* (this.moreWidth - this.initMoreWidth - 1))