developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
王士厅
033f2eeb 2 parents ce3b647b 73222fb0

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

Inline Side-by-side
Showing 2 changed files with 5 additions and 3 deletions
@@ -82,6 +82,8 @@ export struct InteractMComponent { @@ -82,6 +82,8 @@ export struct InteractMComponent {
82 let contentDTO :ContentDTO = new ContentDTO(); 82 let contentDTO :ContentDTO = new ContentDTO();
83 contentDTO.objectType = this.messageModel.InteractMsubM.contentType 83 contentDTO.objectType = this.messageModel.InteractMsubM.contentType
84 contentDTO.objectId = this.messageModel.InteractMsubM.contentId 84 contentDTO.objectId = this.messageModel.InteractMsubM.contentId
  85 + contentDTO.relId = this.messageModel.InteractMsubM.contentRelId
  86 + contentDTO.relType = this.messageModel.InteractMsubM.contentRelType
85 ProcessUtils.processPage(contentDTO) 87 ProcessUtils.processPage(contentDTO)
86 }) 88 })
87 } 89 }
@@ -117,7 +117,7 @@ export struct PlayerEndView { @@ -117,7 +117,7 @@ export struct PlayerEndView {
117 .fontColor('#B2FFFFFF') 117 .fontColor('#B2FFFFFF')
118 .padding({ top: 8 }) 118 .padding({ top: 8 })
119 } 119 }
120 - 120 + Blank().height(this.contentDetailData.rmhInfo == null ? 26:16)
121 Stack() { 121 Stack() {
122 Row() { 122 Row() {
123 Column() { 123 Column() {
@@ -134,8 +134,7 @@ export struct PlayerEndView { @@ -134,8 +134,7 @@ export struct PlayerEndView {
134 Text('观看人数').fontWeight(400).fontSize(12).fontColor(Color.White) 134 Text('观看人数').fontWeight(400).fontSize(12).fontColor(Color.White)
135 } 135 }
136 } 136 }
137 - .padding({ top: this.contentDetailData.rmhInfo == null ? 26 : 16 })  
138 - Text('').width(1).height(32).margin({ left: 36, right: 36,top:this.contentDetailData.rmhInfo == null ? 26 : 16 }).backgroundColor('#33FFFFFF') 137 + Text('').width(1).height(32).backgroundColor('#33FFFFFF')
139 } 138 }
140 if (this.contentDetailData.rmhInfo != null) { 139 if (this.contentDetailData.rmhInfo != null) {
141 Row() { 140 Row() {
@@ -149,6 +148,7 @@ export struct PlayerEndView { @@ -149,6 +148,7 @@ export struct PlayerEndView {
149 left: 122, 148 left: 122,
150 right: 122 149 right: 122
151 }) 150 })
  151 + .height(42)
152 .backgroundColor(this.followStatus == '0' ? '#FFED2800' : '#CCCCCC') 152 .backgroundColor(this.followStatus == '0' ? '#FFED2800' : '#CCCCCC')
153 .borderRadius(4) 153 .borderRadius(4)
154 .onClick(() => { 154 .onClick(() => {