developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
wangliang_wd
3d959a88 2 parents fb853aac 4ad538b5

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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  feat: 已预约边框
  ref |> 临时修复uat直播无法进入问题
Inline Side-by-side
Showing 3 changed files with 10 additions and 3 deletions
@@ -336,6 +336,9 @@ export struct ZhSingleRow03 { @@ -336,6 +336,9 @@ export struct ZhSingleRow03 {
336 .fontSize(12) 336 .fontSize(12)
337 .textAlign(TextAlign.Center) 337 .textAlign(TextAlign.Center)
338 .borderRadius(3) 338 .borderRadius(3)
  339 + .borderStyle(BorderStyle.Solid)
  340 + .borderWidth(this.isReserved(Number(item.objectId)) ? 1 : 0)
  341 + .borderColor('#e5e5e5')
339 .onClick(() => { 342 .onClick(() => {
340 343
341 const isSubscribe = !this.isReserved(Number(item.objectId)) 344 const isSubscribe = !this.isReserved(Number(item.objectId))
@@ -160,6 +160,9 @@ export struct AppointmentListChildComponent { @@ -160,6 +160,9 @@ export struct AppointmentListChildComponent {
160 .width(52) 160 .width(52)
161 .height(24) 161 .height(24)
162 .borderRadius(3) 162 .borderRadius(3)
  163 + .borderStyle(BorderStyle.Solid)
  164 + .borderWidth(this.isReserved(Number(item.objectId)) ? 1 : 0)
  165 + .borderColor('#e5e5e5')
163 .onClick(() => { 166 .onClick(() => {
164 this.dialogController.open() 167 this.dialogController.open()
165 }) 168 })
@@ -60,9 +60,10 @@ export class LiveDetailPageLogic { @@ -60,9 +60,10 @@ export class LiveDetailPageLogic {
60 60
61 // 垫图资源 61 // 垫图资源
62 if (this.contentDetailData.liveInfo){ 62 if (this.contentDetailData.liveInfo){
63 -  
64 - if(this.contentDetailData.liveInfo.padImageUri.length > 0){  
65 - this.padImageUri =this.contentDetailData.liveInfo.padImageUri 63 + if(this.contentDetailData.liveInfo.padImageUri) {
  64 + if(this.contentDetailData.liveInfo.padImageUri.length > 0){
  65 + this.padImageUri =this.contentDetailData.liveInfo.padImageUri
  66 + }
66 } 67 }
67 //this.padImageUri = 'https://uatjdcdnphoto.aikan.pdnews.cn/sjbj-20240515/image/display/cdb84fe86b1440d58f3fc585841b928d.jpg' 68 //this.padImageUri = 'https://uatjdcdnphoto.aikan.pdnews.cn/sjbj-20240515/image/display/cdb84fe86b1440d58f3fc585841b928d.jpg'
68 69