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 |> 20830 uat,人民号>推荐,小视频横滑卡配置不支持跳转,不应展示更多按钮
  Revert "fix |> 20830 uat,人民号>推荐,小视频横滑卡配置不支持跳转,不应展示更多按钮"
  fix |> 20830 uat,人民号>推荐,小视频横滑卡配置不支持跳转,不应展示更多按钮
@@ -7,6 +7,7 @@ import { ProcessUtils } from 'wdRouter'; @@ -7,6 +7,7 @@ import { ProcessUtils } from 'wdRouter';
7 import { HttpUtils } from 'wdNetwork/Index'; 7 import { HttpUtils } from 'wdNetwork/Index';
8 import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; 8 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
9 import { InfomationCardClick } from '../../utils/infomationCardClick' 9 import { InfomationCardClick } from '../../utils/infomationCardClick'
  10 +import { StringUtils } from 'wdKit';
10 11
11 /** 12 /**
12 * 小视频横划卡 13 * 小视频横划卡
@@ -78,10 +79,38 @@ export struct ZhSingleRow02 { @@ -78,10 +79,38 @@ export struct ZhSingleRow02 {
78 } 79 }
79 } 80 }
80 81
81 - showMore() {  
82 - return !!this.compDTO.dataSourceType || !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '') 82 + showMore():boolean {
  83 + let showMore = this.checkMoreJumpPage()
  84 + if(!showMore){
  85 + return true
  86 + }else{
  87 + if(this.compDTO && StringUtils.isNotEmpty(this.compDTO?.objectType)){
  88 + if(this.compDTO?.objectType === '0'){
  89 + return false
  90 + }else{
  91 + return true
  92 + }
  93 + }else{
  94 + return false
  95 + }
  96 + }
  97 +
  98 + // return !!this.compDTO.dataSourceType || !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')
  99 + }
  100 +
  101 + checkMoreJumpPage():boolean{
  102 + let localJump = true
  103 +
  104 + if(this.compDTO && StringUtils.isNotEmpty(this.compDTO?.objectType)){
  105 + let type = this.compDTO?.objectType
  106 + if(type == "LIVE_HORIZONTAL_CARD" || type == "LIVE_RESERVATION" || type == "LIVE_MONTHLY_RANKING") {
  107 + localJump = false
  108 + }
  109 + }
  110 + return localJump
83 } 111 }
84 112
  113 +
85 build() { 114 build() {
86 Column() { 115 Column() {
87 //顶部 116 //顶部