Showing
4 changed files
with
20 additions
and
17 deletions
| @@ -91,7 +91,7 @@ export struct ZhSingleRow02 { | @@ -91,7 +91,7 @@ export struct ZhSingleRow02 { | ||
| 91 | .margin({ right: 8 }) | 91 | .margin({ right: 8 }) |
| 92 | }) | 92 | }) |
| 93 | } | 93 | } |
| 94 | - if (this.compDTO.operDataList.length > 2) { | 94 | + if (this.compDTO.operDataList.length >= 2) { |
| 95 | Column() { | 95 | Column() { |
| 96 | if (this.moreWidth > this.initMoreWidth + 2) { | 96 | if (this.moreWidth > this.initMoreWidth + 2) { |
| 97 | Text(this.moreTips) | 97 | Text(this.moreTips) |
| @@ -112,7 +112,7 @@ export struct ZhSingleRow02 { | @@ -112,7 +112,7 @@ export struct ZhSingleRow02 { | ||
| 112 | .width(CommonConstants.FULL_WIDTH) | 112 | .width(CommonConstants.FULL_WIDTH) |
| 113 | .height(208) | 113 | .height(208) |
| 114 | .align(Alignment.Start) | 114 | .align(Alignment.Start) |
| 115 | - .scrollable(this.compDTO.operDataList.length > 2 ? ScrollDirection.Horizontal : ScrollDirection.None) | 115 | + .scrollable(this.compDTO.operDataList.length >= 2 ? ScrollDirection.Horizontal : ScrollDirection.None) |
| 116 | .scrollBar(BarState.Off) | 116 | .scrollBar(BarState.Off) |
| 117 | .edgeEffect(EdgeEffect.None) | 117 | .edgeEffect(EdgeEffect.None) |
| 118 | .onReachEnd(() => { | 118 | .onReachEnd(() => { |
| @@ -155,7 +155,7 @@ export struct ZhSingleRow03 { | @@ -155,7 +155,7 @@ export struct ZhSingleRow03 { | ||
| 155 | this.ItemCard(item) | 155 | this.ItemCard(item) |
| 156 | }) | 156 | }) |
| 157 | } | 157 | } |
| 158 | - if (this.compDTO.operDataList.length > 2) { | 158 | + if (this.compDTO.operDataList.length >= 2) { |
| 159 | Column() { | 159 | Column() { |
| 160 | if (this.moreWidth > this.initMoreWidth + 2) { | 160 | if (this.moreWidth > this.initMoreWidth + 2) { |
| 161 | Text(this.moreTips) | 161 | Text(this.moreTips) |
| @@ -174,7 +174,7 @@ export struct ZhSingleRow03 { | @@ -174,7 +174,7 @@ export struct ZhSingleRow03 { | ||
| 174 | } | 174 | } |
| 175 | } | 175 | } |
| 176 | .align(Alignment.Start) | 176 | .align(Alignment.Start) |
| 177 | - .scrollable(this.compDTO.operDataList.length > 2 ? ScrollDirection.Horizontal : ScrollDirection.None) | 177 | + .scrollable(this.compDTO.operDataList.length >= 2 ? ScrollDirection.Horizontal : ScrollDirection.None) |
| 178 | .scrollBar(BarState.Off) | 178 | .scrollBar(BarState.Off) |
| 179 | .edgeEffect(EdgeEffect.None) | 179 | .edgeEffect(EdgeEffect.None) |
| 180 | .onReachEnd(() => { | 180 | .onReachEnd(() => { |
| @@ -104,7 +104,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { | @@ -104,7 +104,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { | ||
| 104 | }) | 104 | }) |
| 105 | 105 | ||
| 106 | }.justifyContent(FlexAlign.SpaceBetween) | 106 | }.justifyContent(FlexAlign.SpaceBetween) |
| 107 | - .padding({ left: 16, right: 16 }) | 107 | + // .padding({ left: 16, right: 16 }) |
| 108 | .margin({ top: 8, bottom: 8 }) | 108 | .margin({ top: 8, bottom: 8 }) |
| 109 | .width('100%') | 109 | .width('100%') |
| 110 | 110 | ||
| @@ -131,7 +131,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { | @@ -131,7 +131,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { | ||
| 131 | .width(150) | 131 | .width(150) |
| 132 | .lineHeight(19) | 132 | .lineHeight(19) |
| 133 | } | 133 | } |
| 134 | - .padding({ left: (index == 0) ? 16 : 0, right: 16 }) | 134 | + .padding({ right: 16 }) |
| 135 | // .offset({x:16}) | 135 | // .offset({x:16}) |
| 136 | .onClick(() => { | 136 | .onClick(() => { |
| 137 | InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName) | 137 | InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName) |
| @@ -187,12 +187,12 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { | @@ -187,12 +187,12 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { | ||
| 187 | // .margin({left:16,right:16}) | 187 | // .margin({left:16,right:16}) |
| 188 | 188 | ||
| 189 | } | 189 | } |
| 190 | - .width("100%") | 190 | + // .width("100%") |
| 191 | .padding({ | 191 | .padding({ |
| 192 | - top: 14, | ||
| 193 | - left: 0, | ||
| 194 | - right: 0, | ||
| 195 | - bottom: 14 | 192 | + left: $r('app.float.card_comp_pagePadding_lf'), |
| 193 | + right: $r('app.float.card_comp_pagePadding_lf'), | ||
| 194 | + top: $r('app.float.card_comp_pagePadding_tb'), | ||
| 195 | + bottom: $r('app.float.card_comp_pagePadding_tb') | ||
| 196 | }) | 196 | }) |
| 197 | .backgroundColor($r("app.color.white")) | 197 | .backgroundColor($r("app.color.white")) |
| 198 | // .backgroundColor($r("app.color.color_FE4B05")) | 198 | // .backgroundColor($r("app.color.color_FE4B05")) |
| @@ -119,7 +119,7 @@ export struct LiveHorizontalCardComponent { | @@ -119,7 +119,7 @@ export struct LiveHorizontalCardComponent { | ||
| 119 | }) | 119 | }) |
| 120 | } | 120 | } |
| 121 | }.justifyContent(FlexAlign.SpaceBetween) | 121 | }.justifyContent(FlexAlign.SpaceBetween) |
| 122 | - .padding({ left: 16, right: 16 }) | 122 | + // .padding({ left: 16, right: 16 }) |
| 123 | .margin({ top: 8, bottom: 8 }) | 123 | .margin({ top: 8, bottom: 8 }) |
| 124 | .width(CommonConstants.FULL_WIDTH) | 124 | .width(CommonConstants.FULL_WIDTH) |
| 125 | 125 | ||
| @@ -153,7 +153,7 @@ export struct LiveHorizontalCardComponent { | @@ -153,7 +153,7 @@ export struct LiveHorizontalCardComponent { | ||
| 153 | .margin({ top: 8 }) | 153 | .margin({ top: 8 }) |
| 154 | .width(this.compDTO.operDataList.length == 2 ? 210 : 150) | 154 | .width(this.compDTO.operDataList.length == 2 ? 210 : 150) |
| 155 | } | 155 | } |
| 156 | - .padding({ left: (index == 0) ? 16 : 0, right: 16 }) | 156 | + .padding({ right: 16 }) |
| 157 | .onClick(() => { | 157 | .onClick(() => { |
| 158 | InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName) | 158 | InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName) |
| 159 | if (item.objectType != '0') { | 159 | if (item.objectType != '0') { |
| @@ -163,7 +163,7 @@ export struct LiveHorizontalCardComponent { | @@ -163,7 +163,7 @@ export struct LiveHorizontalCardComponent { | ||
| 163 | }) | 163 | }) |
| 164 | }) | 164 | }) |
| 165 | } | 165 | } |
| 166 | - if (this.compDTO.operDataList.length > 2) { | 166 | + if (this.compDTO.operDataList.length >= 2) { |
| 167 | Column() { | 167 | Column() { |
| 168 | if (this.moreWidth > this.initMoreWidth + 2) { | 168 | if (this.moreWidth > this.initMoreWidth + 2) { |
| 169 | Text(this.moreTips) | 169 | Text(this.moreTips) |
| @@ -182,7 +182,7 @@ export struct LiveHorizontalCardComponent { | @@ -182,7 +182,7 @@ export struct LiveHorizontalCardComponent { | ||
| 182 | } | 182 | } |
| 183 | } | 183 | } |
| 184 | .align(Alignment.Start) | 184 | .align(Alignment.Start) |
| 185 | - .scrollable(this.compDTO.operDataList.length > 2 ? ScrollDirection.Horizontal : ScrollDirection.None) | 185 | + .scrollable(this.compDTO.operDataList.length >= 2 ? ScrollDirection.Horizontal : ScrollDirection.None) |
| 186 | .scrollBar(BarState.Off) | 186 | .scrollBar(BarState.Off) |
| 187 | .edgeEffect(EdgeEffect.None) | 187 | .edgeEffect(EdgeEffect.None) |
| 188 | .onReachEnd(() => { | 188 | .onReachEnd(() => { |
| @@ -211,9 +211,12 @@ export struct LiveHorizontalCardComponent { | @@ -211,9 +211,12 @@ export struct LiveHorizontalCardComponent { | ||
| 211 | LiveHorizontalCardForOneComponent({ contentDTO: this.compDTO.operDataList[0] }) | 211 | LiveHorizontalCardForOneComponent({ contentDTO: this.compDTO.operDataList[0] }) |
| 212 | } | 212 | } |
| 213 | } | 213 | } |
| 214 | - .width(CommonConstants.FULL_WIDTH) | 214 | + // .width(CommonConstants.FULL_WIDTH) |
| 215 | .padding({ | 215 | .padding({ |
| 216 | - top: 14, | 216 | + left: $r('app.float.card_comp_pagePadding_lf'), |
| 217 | + right: $r('app.float.card_comp_pagePadding_lf'), | ||
| 218 | + top: $r('app.float.card_comp_pagePadding_tb'), | ||
| 219 | + bottom: $r('app.float.card_comp_pagePadding_tb') | ||
| 217 | }) | 220 | }) |
| 218 | .backgroundColor($r("app.color.white")) | 221 | .backgroundColor($r("app.color.white")) |
| 219 | } | 222 | } |
-
Please register or login to post a comment