陈剑华

fix: 横划卡(16:9或3:2),左右横滑时,应从手机边缘消失

@@ -72,6 +72,9 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -72,6 +72,9 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
72 .fontColor($r("app.color.color_222222")) 72 .fontColor($r("app.color.color_222222"))
73 .fontWeight(600) 73 .fontWeight(600)
74 } 74 }
  75 + .padding({
  76 + left: this.compDTO.operDataList.length >= 2 ? 20 : 0
  77 + })
75 78
76 Row() { 79 Row() {
77 Text("更多") 80 Text("更多")
@@ -129,6 +132,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -129,6 +132,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
129 InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName) 132 InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
130 ProcessUtils.processPage(item) 133 ProcessUtils.processPage(item)
131 }) 134 })
  135 + .padding({ right: 16, left: index == 0 ? 20: 0 })
132 }) 136 })
133 } 137 }
134 138
@@ -190,16 +194,18 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -190,16 +194,18 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
190 // .margin({left:16,right:16}) 194 // .margin({left:16,right:16})
191 195
192 } 196 }
193 - // .width("100%") 197 + .width(this.compDTO.operDataList.length >= 2 ? 'calc(18vp + 100%)' : CommonConstants.FULL_WIDTH)
194 .padding({ 198 .padding({
195 - left: $r('app.float.card_comp_pagePadding_lf'),  
196 - right: $r('app.float.card_comp_pagePadding_lf'), 199 + left: this.compDTO.operDataList.length >= 2 ? 0 : 10,
  200 + right: this.compDTO.operDataList.length >= 2 ? 0 : 10,
197 top: $r('app.float.card_comp_pagePadding_tb'), 201 top: $r('app.float.card_comp_pagePadding_tb'),
198 bottom: 6 202 bottom: 6
199 }) 203 })
200 .backgroundColor($r("app.color.white")) 204 .backgroundColor($r("app.color.white"))
201 - // .backgroundColor($r("app.color.color_FE4B05"))  
202 - .margin({ bottom: 8 }) 205 + .margin({
  206 + left: this.compDTO.operDataList.length >= 2 ? -6 : 0,
  207 + bottom: 8
  208 + })
203 } 209 }
204 210
205 private jumpToLiveMorePage() { 211 private jumpToLiveMorePage() {
@@ -122,6 +122,9 @@ export struct LiveHorizontalCardComponent { @@ -122,6 +122,9 @@ export struct LiveHorizontalCardComponent {
122 .fontColor($r("app.color.color_222222")) 122 .fontColor($r("app.color.color_222222"))
123 .fontWeight(600) 123 .fontWeight(600)
124 } 124 }
  125 + .padding({
  126 + left: this.compDTO.operDataList.length >= 2 ? 20 : 0
  127 + })
125 128
126 if (this.showMore()) { 129 if (this.showMore()) {
127 Row() { 130 Row() {
@@ -139,7 +142,6 @@ export struct LiveHorizontalCardComponent { @@ -139,7 +142,6 @@ export struct LiveHorizontalCardComponent {
139 } 142 }
140 } 143 }
141 .justifyContent(FlexAlign.SpaceBetween) 144 .justifyContent(FlexAlign.SpaceBetween)
142 - // .padding({ left: 16, right: 16 })  
143 .margin({ bottom: 10 }) 145 .margin({ bottom: 10 })
144 .width(CommonConstants.FULL_WIDTH) 146 .width(CommonConstants.FULL_WIDTH)
145 147
@@ -177,7 +179,7 @@ export struct LiveHorizontalCardComponent { @@ -177,7 +179,7 @@ export struct LiveHorizontalCardComponent {
177 .lineHeight(21) 179 .lineHeight(21)
178 } 180 }
179 .height(this.compDTO.operDataList.length == 2 ? 167 : 134) 181 .height(this.compDTO.operDataList.length == 2 ? 167 : 134)
180 - .padding({ right: 8 }) 182 + .padding({ right: index == this.compDTO.operDataList.length - 1 ? 16 : 8, left: index == 0 ? 20: 0 })
181 .onClick(() => { 183 .onClick(() => {
182 InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName) 184 InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
183 if (item.objectType != '0') { 185 if (item.objectType != '0') {
@@ -251,13 +253,16 @@ export struct LiveHorizontalCardComponent { @@ -251,13 +253,16 @@ export struct LiveHorizontalCardComponent {
251 }) 253 })
252 } 254 }
253 } 255 }
254 - // .width(CommonConstants.FULL_WIDTH) 256 + .width(this.compDTO.operDataList.length >= 2 ? 'calc(18vp + 100%)' : CommonConstants.FULL_WIDTH)
255 .padding({ 257 .padding({
256 - left: 10,  
257 - right: 10, 258 + left: this.compDTO.operDataList.length >= 2 ? 0 : 10,
  259 + right: this.compDTO.operDataList.length >= 2 ? 0 : 10,
258 top: $r('app.float.card_comp_pagePadding_tb'), 260 top: $r('app.float.card_comp_pagePadding_tb'),
259 bottom: $r('app.float.card_comp_pagePadding_tb') 261 bottom: $r('app.float.card_comp_pagePadding_tb')
260 }) 262 })
  263 + .margin({
  264 + left: this.compDTO.operDataList.length >= 2 ? -6 : 0
  265 + })
261 .backgroundColor($r("app.color.white")) 266 .backgroundColor($r("app.color.white"))
262 } 267 }
263 268