developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
王士厅
0b942991 2 parents 052cea02 5364528b

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

Inline Side-by-side
Showing 2 changed files with 7 additions and 6 deletions
@@ -134,7 +134,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -134,7 +134,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
134 .aspectRatio(1.5) 134 .aspectRatio(1.5)
135 .width(this.compDTO.operDataList.length == 2 ? 210 : 150) 135 .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
136 .borderRadius(4) 136 .borderRadius(4)
137 - .objectFit(ImageFit.Cover) 137 + .objectFit(ImageFit.Contain)
138 CardMediaInfo({ 138 CardMediaInfo({
139 livePeopleNum:false, 139 livePeopleNum:false,
140 contentDTO: item 140 contentDTO: item
@@ -153,7 +153,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -153,7 +153,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
153 .width(this.compDTO.operDataList.length == 2 ? 210 : 150) 153 .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
154 .lineHeight(21) 154 .lineHeight(21)
155 } 155 }
156 - .height(this.compDTO.operDataList.length == 2 ? 190 : 150) 156 + .height(this.compDTO.operDataList.length == 2 ? 180 : 148)
157 .padding({ right: 16 }) 157 .padding({ right: 16 })
158 // .offset({x:16}) 158 // .offset({x:16})
159 .onClick(() => { 159 .onClick(() => {
@@ -167,7 +167,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -167,7 +167,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
167 Row() { 167 Row() {
168 Ellipse() 168 Ellipse()
169 .width(2* (this.moreWidth - this.initMoreWidth - 1)) 169 .width(2* (this.moreWidth - this.initMoreWidth - 1))
170 - .height(this.compDTO.operDataList.length == 2 ? 180 : 146) 170 + .height(this.compDTO.operDataList.length == 2 ? 180 : 148)
171 .fill(0xf1f3f4) 171 .fill(0xf1f3f4)
172 .position({ left: -(this.moreWidth - this.initMoreWidth - 3) * 0.8 }) 172 .position({ left: -(this.moreWidth - this.initMoreWidth - 3) * 0.8 })
173 173
@@ -181,7 +181,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -181,7 +181,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
181 } 181 }
182 .justifyContent(FlexAlign.Center) 182 .justifyContent(FlexAlign.Center)
183 .align(Alignment.Center) 183 .align(Alignment.Center)
184 - .height(this.compDTO.operDataList.length == 2 ? 180 : 146) 184 + .height(this.compDTO.operDataList.length == 2 ? 180 : 148)
185 .width(this.initMoreWidth) 185 .width(this.initMoreWidth)
186 .backgroundColor(0xf1f3f4) 186 .backgroundColor(0xf1f3f4)
187 .borderRadius({ topLeft: 5, bottomLeft: 5 }) 187 .borderRadius({ topLeft: 5, bottomLeft: 5 })
@@ -213,6 +213,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -213,6 +213,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
213 } 213 }
214 } 214 }
215 }) 215 })
  216 + .height(this.compDTO.operDataList.length == 2 ? 180 : 148)
216 // .width('100%') 217 // .width('100%')
217 218
218 // .backgroundColor($r("app.color.color_FE4B05")) 219 // .backgroundColor($r("app.color.color_FE4B05"))
@@ -170,7 +170,7 @@ export struct LiveHorizontalCardComponent { @@ -170,7 +170,7 @@ export struct LiveHorizontalCardComponent {
170 .width(this.compDTO.operDataList.length == 2 ? 210 : 150) 170 .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
171 .lineHeight(21) 171 .lineHeight(21)
172 } 172 }
173 - .height(this.compDTO.operDataList.length == 2 ? 190 : 150) 173 + .height(this.compDTO.operDataList.length == 2 ? 180 : 148)
174 .padding({ right: 16 }) 174 .padding({ right: 16 })
175 .onClick(() => { 175 .onClick(() => {
176 InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName) 176 InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
@@ -232,7 +232,7 @@ export struct LiveHorizontalCardComponent { @@ -232,7 +232,7 @@ export struct LiveHorizontalCardComponent {
232 } 232 }
233 }) 233 })
234 .width(CommonConstants.FULL_WIDTH) 234 .width(CommonConstants.FULL_WIDTH)
235 - .height(this.compDTO.operDataList.length == 2 ? 180 : 136) 235 + .height(this.compDTO.operDataList.length == 2 ? 180 : 148)
236 } else if (this.compDTO.operDataList.length) { 236 } else if (this.compDTO.operDataList.length) {
237 // 一个 237 // 一个
238 LiveHorizontalCardForOneComponent({ contentDTO: this.compDTO.operDataList[0] }) 238 LiveHorizontalCardForOneComponent({ contentDTO: this.compDTO.operDataList[0] })