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(19312):UI还原问题-【uat】进入“竖屏直播间-测试” 大V图标未显示,看图
  feat:评论区点击游客头像,不应toast提示:“暂时无法查看该创作者主页”问题修复
@@ -40,22 +40,34 @@ export struct LiveFollowComponent { @@ -40,22 +40,34 @@ export struct LiveFollowComponent {
40 bottomLeft: 90 40 bottomLeft: 90
41 }) 41 })
42 Row() { 42 Row() {
43 - //号主头像  
44 - Image(this.rmhInfo.rmhHeadUrl)  
45 - .alt($r('app.media.icon_default_head_mater'))  
46 - .width(24)  
47 - .height(24)  
48 - .borderRadius(90)  
49 - .onClick(() => {  
50 - // 跳转到号主页  
51 - if (this.contentDetailData.rmhInfo?.cnMainControl === 1) {  
52 - const params: Params = {  
53 - creatorId: this.contentDetailData.rmhInfo.rmhId,  
54 - pageID: '' 43 + Stack({alignContent: Alignment.Bottom}){
  44 + //号主头像
  45 + Image(this.rmhInfo.rmhHeadUrl)
  46 + .alt($r('app.media.icon_default_head_mater'))
  47 + .width(24)
  48 + .height(24)
  49 + .borderRadius(90)
  50 + .onClick(() => {
  51 + // 跳转到号主页
  52 + if (this.contentDetailData.rmhInfo?.cnMainControl === 1) {
  53 + const params: Params = {
  54 + creatorId: this.contentDetailData.rmhInfo.rmhId,
  55 + pageID: ''
  56 + }
  57 + WDRouterRule.jumpWithPage(WDRouterPage.peopleShipHomePage, params)
55 } 58 }
56 - WDRouterRule.jumpWithPage(WDRouterPage.peopleShipHomePage, params)  
57 - }  
58 - }) 59 + })
  60 + if(this.contentDetailData.rmhInfo?.authIcon){
  61 + Row(){
  62 + Image(this.contentDetailData.rmhInfo?.authIcon)
  63 + .width(10)
  64 + .height(10)
  65 + .objectFit(ImageFit.Cover)
  66 + }.width(24)
  67 + .justifyContent(FlexAlign.End)
  68 + }
  69 + }.width(24).height(24)
  70 +
59 //号主名称 71 //号主名称
60 Text(this.rmhInfo.rmhName) 72 Text(this.rmhInfo.rmhName)
61 .fontColor(Color.White) 73 .fontColor(Color.White)
@@ -496,7 +496,7 @@ class CommentViewModel { @@ -496,7 +496,7 @@ class CommentViewModel {
496 } 496 }
497 HttpBizUtil.post<ResponseDTO<MasterDetailRes>>(url, item).then((result) => { 497 HttpBizUtil.post<ResponseDTO<MasterDetailRes>>(url, item).then((result) => {
498 if (!result.data || result.data.mainControl != 1) { 498 if (!result.data || result.data.mainControl != 1) {
499 - ToastUtils.longToast("暂时无法查看该创作者主页") 499 + // ToastUtils.longToast("暂时无法查看该创作者主页")
500 return 500 return
501 } 501 }
502 502