陈剑华

Merge remote-tracking branch 'origin/main'

@@ -37,17 +37,11 @@ export struct AppointmentListChildComponent { @@ -37,17 +37,11 @@ export struct AppointmentListChildComponent {
37 Image(this.loadImg ? this.item?.imageUrl[0] : '') 37 Image(this.loadImg ? this.item?.imageUrl[0] : '')
38 .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5) 38 .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
39 .width('100%') 39 .width('100%')
40 - .constraintSize({  
41 - maxHeight: 196  
42 - })  
43 - .aspectRatio(16 / 9)  
44 - .objectFit(ImageFit.Auto)  
45 - .interpolation(ImageInterpolation.High)  
46 - .borderRadius(4)  
47 - .borderStyle(BorderStyle.Solid) 40 + .aspectRatio(167 / 95)
48 .borderWidth(0.5) 41 .borderWidth(0.5)
49 .borderColor($r('app.color.color_0D000000')) 42 .borderColor($r('app.color.color_0D000000'))
50 - 43 + .borderRadius(4)
  44 + .borderStyle(BorderStyle.Solid)
51 45
52 if (this.item.status == "wait") { 46 if (this.item.status == "wait") {
53 Row() { 47 Row() {
@@ -81,7 +75,7 @@ export struct AppointmentListChildComponent { @@ -81,7 +75,7 @@ export struct AppointmentListChildComponent {
81 .alignItems(VerticalAlign.Bottom) 75 .alignItems(VerticalAlign.Bottom)
82 .justifyContent(FlexAlign.End) 76 .justifyContent(FlexAlign.End)
83 .position({ 77 .position({
84 - x: '80.5%' 78 + x: '85.5%'
85 }) 79 })
86 } 80 }
87 } 81 }
@@ -147,7 +141,7 @@ export struct AppointmentListChildComponent { @@ -147,7 +141,7 @@ export struct AppointmentListChildComponent {
147 } 141 }
148 } 142 }
149 .height(24) 143 .height(24)
150 - .width(this.item.status == "wait"?150:82) 144 + // .width(this.item.status == "wait"?150:82)
151 .padding({ left: 10, right: 10}) 145 .padding({ left: 10, right: 10})
152 .alignItems(VerticalAlign.Center) 146 .alignItems(VerticalAlign.Center)
153 .backgroundColor($r('app.color.color_F5F5F5')) 147 .backgroundColor($r('app.color.color_F5F5F5'))