developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
陈剑华
3e679d55 1 parent 467511a8

fix: 信息流卡片内外边距修改

Inline Side-by-side
Showing 28 changed files with 131 additions and 78 deletions
@@ -75,6 +75,10 @@ export struct CompParser { @@ -75,6 +75,10 @@ export struct CompParser {
75 // Text(JSON.stringify(this.compDTO.compStyle)) 75 // Text(JSON.stringify(this.compDTO.compStyle))
76 this.componentBuilder(); 76 this.componentBuilder();
77 } 77 }
  78 + .margin({
  79 + left: 6,
  80 + right: (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05 || this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) ? 0 : 6
  81 + })
78 } 82 }
79 83
80 @Builder 84 @Builder
@@ -206,16 +210,16 @@ export struct CompParser { @@ -206,16 +210,16 @@ export struct CompParser {
206 this.compDTO.compStyle === CompStyle.Zh_Single_Row_06 210 this.compDTO.compStyle === CompStyle.Zh_Single_Row_06
207 ) { 211 ) {
208 if (this.compDTO.compStyle === this.nextCompDTO.compStyle) { 212 if (this.compDTO.compStyle === this.nextCompDTO.compStyle) {
209 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 213 + Divider().strokeWidth(1).color('#f5f5f5').width('103%').padding({ left: 16, right: 16 }).margin({left: -6})
210 } else { 214 } else {
211 - Divider().strokeWidth(5).color('#f5f5f5') 215 + Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6})
212 } 216 }
213 } else if (this.compDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) { 217 } else if (this.compDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) {
214 // 大专题 218 // 大专题
215 if (this.nextCompDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) { 219 if (this.nextCompDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) {
216 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 220 + Divider().strokeWidth(1).color('#f5f5f5').width('103%').padding({ left: 16, right: 16 }).margin({left: -6})
217 } else { 221 } else {
218 - Divider().strokeWidth(5).color('#f5f5f5') 222 + Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6})
219 } 223 }
220 } else if (this.compDTO.compType === 'appStyle' || this.compDTO.compStyle === CompStyle.Zh_Single_Row_01) { 224 } else if (this.compDTO.compType === 'appStyle' || this.compDTO.compStyle === CompStyle.Zh_Single_Row_01) {
221 if ( 225 if (
@@ -225,9 +229,9 @@ export struct CompParser { @@ -225,9 +229,9 @@ export struct CompParser {
225 this.nextCompDTO.compStyle === CompStyle.Zh_Single_Row_04 || 229 this.nextCompDTO.compStyle === CompStyle.Zh_Single_Row_04 ||
226 this.nextCompDTO.compStyle === CompStyle.Zh_Single_Row_06 230 this.nextCompDTO.compStyle === CompStyle.Zh_Single_Row_06
227 ) { 231 ) {
228 - Divider().strokeWidth(5).color('#f5f5f5') 232 + Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6})
229 } else { 233 } else {
230 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 234 + Divider().strokeWidth(1).color('#f5f5f5').width('103%').padding({ left: 16, right: 16 }).margin({left: -6})
231 } 235 }
232 } else { 236 } else {
233 // Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 237 // Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
@@ -82,10 +82,11 @@ export struct Card11Component { @@ -82,10 +82,11 @@ export struct Card11Component {
82 82
83 // 评论等信息 83 // 评论等信息
84 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO }) 84 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
85 - }.width(CommonConstants.FULL_WIDTH) 85 + }
  86 + .width(CommonConstants.FULL_WIDTH)
86 .padding({ 87 .padding({
87 - left: $r('app.float.card_comp_pagePadding_lf'),  
88 - right: $r('app.float.card_comp_pagePadding_lf'), 88 + left: 10,
  89 + right: 10,
89 top: $r('app.float.card_comp_pagePadding_tb'), 90 top: $r('app.float.card_comp_pagePadding_tb'),
90 bottom: $r('app.float.card_comp_pagePadding_tb') 91 bottom: $r('app.float.card_comp_pagePadding_tb')
91 }) 92 })
@@ -80,11 +80,13 @@ export struct Card12Component { @@ -80,11 +80,13 @@ export struct Card12Component {
80 CarderInteraction({contentDTO: this.contentDTO}) 80 CarderInteraction({contentDTO: this.contentDTO})
81 } 81 }
82 .padding({ 82 .padding({
83 - left: $r('app.float.card_comp_pagePadding_lf'),  
84 - right: $r('app.float.card_comp_pagePadding_lf'), 83 + left: 10,
  84 + right: 10,
85 top: $r('app.float.card_comp_pagePadding_tb'), 85 top: $r('app.float.card_comp_pagePadding_tb'),
86 bottom: $r('app.float.card_comp_pagePadding_tb') 86 bottom: $r('app.float.card_comp_pagePadding_tb')
87 }) 87 })
  88 + .backgroundColor(0xffffff)
  89 + .width(CommonConstants.FULL_WIDTH)
88 .onClick((event: ClickEvent) => { 90 .onClick((event: ClickEvent) => {
89 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName) 91 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
90 if (router.getState().name !== 'MyCollectionListPage') { 92 if (router.getState().name !== 'MyCollectionListPage') {
@@ -96,11 +96,13 @@ export struct Card14Component { @@ -96,11 +96,13 @@ export struct Card14Component {
96 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件 96 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
97 } 97 }
98 .padding({ 98 .padding({
99 - left: $r('app.float.card_comp_pagePadding_lf'),  
100 - right: $r('app.float.card_comp_pagePadding_lf'), 99 + left: 10,
  100 + right: 10,
101 top: $r('app.float.card_comp_pagePadding_tb'), 101 top: $r('app.float.card_comp_pagePadding_tb'),
102 bottom: $r('app.float.card_comp_pagePadding_tb') 102 bottom: $r('app.float.card_comp_pagePadding_tb')
103 }) 103 })
  104 + .backgroundColor(0xffffff)
  105 + .width(CommonConstants.FULL_WIDTH)
104 .onClick((event: ClickEvent) => { 106 .onClick((event: ClickEvent) => {
105 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName) 107 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
106 if (router.getState().name !== 'MyCollectionListPage') { 108 if (router.getState().name !== 'MyCollectionListPage') {
@@ -95,11 +95,13 @@ export struct Card15Component { @@ -95,11 +95,13 @@ export struct Card15Component {
95 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件 95 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
96 } 96 }
97 .padding({ 97 .padding({
98 - left: $r('app.float.card_comp_pagePadding_lf'),  
99 - right: $r('app.float.card_comp_pagePadding_lf'), 98 + left: 10,
  99 + right: 10,
100 top: $r('app.float.card_comp_pagePadding_tb'), 100 top: $r('app.float.card_comp_pagePadding_tb'),
101 bottom: $r('app.float.card_comp_pagePadding_tb') 101 bottom: $r('app.float.card_comp_pagePadding_tb')
102 }) 102 })
  103 + .backgroundColor(0xffffff)
  104 + .width(CommonConstants.FULL_WIDTH)
103 .onClick((event: ClickEvent) => { 105 .onClick((event: ClickEvent) => {
104 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName) 106 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
105 if (router.getState().name !== 'MyCollectionListPage') { 107 if (router.getState().name !== 'MyCollectionListPage') {
@@ -128,11 +128,13 @@ export struct Card16Component { @@ -128,11 +128,13 @@ export struct Card16Component {
128 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件 128 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
129 } 129 }
130 .padding({ 130 .padding({
131 - left: $r('app.float.card_comp_pagePadding_lf'),  
132 - right: $r('app.float.card_comp_pagePadding_lf'), 131 + left: 10,
  132 + right: 10,
133 top: $r('app.float.card_comp_pagePadding_tb'), 133 top: $r('app.float.card_comp_pagePadding_tb'),
134 bottom: $r('app.float.card_comp_pagePadding_tb') 134 bottom: $r('app.float.card_comp_pagePadding_tb')
135 }) 135 })
  136 + .backgroundColor(0xffffff)
  137 + .width(CommonConstants.FULL_WIDTH)
136 .onClick((event: ClickEvent) => { 138 .onClick((event: ClickEvent) => {
137 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName) 139 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
138 if (router.getState().name !== 'MyCollectionListPage') { 140 if (router.getState().name !== 'MyCollectionListPage') {
@@ -134,12 +134,13 @@ export struct Card17Component { @@ -134,12 +134,13 @@ export struct Card17Component {
134 // 评论等信息 134 // 评论等信息
135 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO }) 135 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
136 } 136 }
137 - .width(CommonConstants.FULL_WIDTH)  
138 .padding({ 137 .padding({
139 - left: $r('app.float.card_comp_pagePadding_lf'),  
140 - right: $r('app.float.card_comp_pagePadding_lf'), 138 + left: 10,
  139 + right: 10,
141 top: $r('app.float.card_comp_pagePadding_tb'), 140 top: $r('app.float.card_comp_pagePadding_tb'),
142 bottom: $r('app.float.card_comp_pagePadding_tb') 141 bottom: $r('app.float.card_comp_pagePadding_tb')
143 }) 142 })
  143 + .backgroundColor(0xffffff)
  144 + .width(CommonConstants.FULL_WIDTH)
144 } 145 }
145 } 146 }
@@ -86,11 +86,13 @@ export struct Card19Component { @@ -86,11 +86,13 @@ export struct Card19Component {
86 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件 86 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
87 } 87 }
88 .padding({ 88 .padding({
89 - left: $r('app.float.card_comp_pagePadding_lf'),  
90 - right: $r('app.float.card_comp_pagePadding_lf'), 89 + left: 10,
  90 + right: 10,
91 top: $r('app.float.card_comp_pagePadding_tb'), 91 top: $r('app.float.card_comp_pagePadding_tb'),
92 bottom: $r('app.float.card_comp_pagePadding_tb') 92 bottom: $r('app.float.card_comp_pagePadding_tb')
93 }) 93 })
  94 + .backgroundColor(0xffffff)
  95 + .width(CommonConstants.FULL_WIDTH)
94 .onClick((event: ClickEvent) => { 96 .onClick((event: ClickEvent) => {
95 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName) 97 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
96 if (router.getState().name !== 'MyCollectionListPage') { 98 if (router.getState().name !== 'MyCollectionListPage') {
@@ -80,11 +80,13 @@ export struct Card20Component { @@ -80,11 +80,13 @@ export struct Card20Component {
80 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件 80 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
81 } 81 }
82 .padding({ 82 .padding({
83 - left: $r('app.float.card_comp_pagePadding_lf'),  
84 - right: $r('app.float.card_comp_pagePadding_lf'), 83 + left: 10,
  84 + right: 10,
85 top: $r('app.float.card_comp_pagePadding_tb'), 85 top: $r('app.float.card_comp_pagePadding_tb'),
86 bottom: $r('app.float.card_comp_pagePadding_tb') 86 bottom: $r('app.float.card_comp_pagePadding_tb')
87 }) 87 })
  88 + .backgroundColor(0xffffff)
  89 + .width(CommonConstants.FULL_WIDTH)
88 .onClick((event: ClickEvent) => { 90 .onClick((event: ClickEvent) => {
89 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName) 91 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
90 if (router.getState().name !== 'MyCollectionListPage') { 92 if (router.getState().name !== 'MyCollectionListPage') {
@@ -102,11 +102,12 @@ export struct Card21Component { @@ -102,11 +102,12 @@ export struct Card21Component {
102 ProcessUtils.processPage(this.contentDTO) 102 ProcessUtils.processPage(this.contentDTO)
103 }) 103 })
104 .padding({ 104 .padding({
105 - left: $r('app.float.card_comp_pagePadding_lf'),  
106 - right: $r('app.float.card_comp_pagePadding_lf'), 105 + left: 10,
  106 + right: 10,
107 top: $r('app.float.card_comp_pagePadding_tb'), 107 top: $r('app.float.card_comp_pagePadding_tb'),
108 bottom: $r('app.float.card_comp_pagePadding_tb') 108 bottom: $r('app.float.card_comp_pagePadding_tb')
109 }) 109 })
  110 + .backgroundColor(0xffffff)
110 .width(CommonConstants.FULL_WIDTH) 111 .width(CommonConstants.FULL_WIDTH)
111 } 112 }
112 } 113 }
@@ -115,13 +115,14 @@ export struct Card2Component { @@ -115,13 +115,14 @@ export struct Card2Component {
115 // 评论等信息 115 // 评论等信息
116 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO }) 116 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
117 } 117 }
118 - .width(CommonConstants.FULL_WIDTH)  
119 .padding({ 118 .padding({
120 - left: $r('app.float.card_comp_pagePadding_lf'),  
121 - right: $r('app.float.card_comp_pagePadding_lf'), 119 + left: 10,
  120 + right: 10,
122 top: $r('app.float.card_comp_pagePadding_tb'), 121 top: $r('app.float.card_comp_pagePadding_tb'),
123 bottom: $r('app.float.card_comp_pagePadding_tb') 122 bottom: $r('app.float.card_comp_pagePadding_tb')
124 }) 123 })
  124 + .backgroundColor(0xffffff)
  125 + .width(CommonConstants.FULL_WIDTH)
125 .onClick((event: ClickEvent) => { 126 .onClick((event: ClickEvent) => {
126 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName) 127 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
127 if (router.getState().name !== 'MyCollectionListPage') { 128 if (router.getState().name !== 'MyCollectionListPage') {
@@ -78,13 +78,14 @@ export struct Card3Component { @@ -78,13 +78,14 @@ export struct Card3Component {
78 // 评论等信息 78 // 评论等信息
79 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO }) 79 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
80 } 80 }
81 - .width(CommonConstants.FULL_WIDTH)  
82 .padding({ 81 .padding({
83 - left: $r('app.float.card_comp_pagePadding_lf'),  
84 - right: $r('app.float.card_comp_pagePadding_lf'), 82 + left: 10,
  83 + right: 10,
85 top: $r('app.float.card_comp_pagePadding_tb'), 84 top: $r('app.float.card_comp_pagePadding_tb'),
86 bottom: $r('app.float.card_comp_pagePadding_tb') 85 bottom: $r('app.float.card_comp_pagePadding_tb')
87 }) 86 })
  87 + .backgroundColor(0xffffff)
  88 + .width(CommonConstants.FULL_WIDTH)
88 .onClick((event: ClickEvent) => { 89 .onClick((event: ClickEvent) => {
89 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName) 90 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
90 if (router.getState().name !== 'MyCollectionListPage') { 91 if (router.getState().name !== 'MyCollectionListPage') {
@@ -133,13 +133,14 @@ export struct Card4Component { @@ -133,13 +133,14 @@ export struct Card4Component {
133 //bottom 评论等信息 133 //bottom 评论等信息
134 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO }) 134 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
135 } 135 }
136 - .width(CommonConstants.FULL_WIDTH)  
137 .padding({ 136 .padding({
138 - left: $r('app.float.card_comp_pagePadding_lf'),  
139 - right: $r('app.float.card_comp_pagePadding_lf'), 137 + left: 10,
  138 + right: 10,
140 top: $r('app.float.card_comp_pagePadding_tb'), 139 top: $r('app.float.card_comp_pagePadding_tb'),
141 bottom: $r('app.float.card_comp_pagePadding_tb') 140 bottom: $r('app.float.card_comp_pagePadding_tb')
142 }) 141 })
  142 + .backgroundColor(0xffffff)
  143 + .width(CommonConstants.FULL_WIDTH)
143 } 144 }
144 } 145 }
145 146
@@ -122,13 +122,14 @@ export struct Card5Component { @@ -122,13 +122,14 @@ export struct Card5Component {
122 } 122 }
123 } 123 }
124 .alignContent(Alignment.Bottom) 124 .alignContent(Alignment.Bottom)
125 - .width(CommonConstants.FULL_WIDTH)  
126 .padding({ 125 .padding({
127 - left: $r('app.float.card_comp_pagePadding_lf'),  
128 - right: $r('app.float.card_comp_pagePadding_lf'), 126 + left: 10,
  127 + right: 10,
129 top: $r('app.float.card_comp_pagePadding_tb'), 128 top: $r('app.float.card_comp_pagePadding_tb'),
130 bottom: $r('app.float.card_comp_pagePadding_tb') 129 bottom: $r('app.float.card_comp_pagePadding_tb')
131 }) 130 })
  131 + .backgroundColor(0xffffff)
  132 + .width(CommonConstants.FULL_WIDTH)
132 .onClick((event: ClickEvent) => { 133 .onClick((event: ClickEvent) => {
133 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName) 134 InfomationCardClick.track(this.compDTO, this.contentDTO, this.pageId, this.pageName)
134 if (router.getState().name !== 'MyCollectionListPage') { 135 if (router.getState().name !== 'MyCollectionListPage') {
@@ -123,12 +123,12 @@ export struct Card6Component { @@ -123,12 +123,12 @@ export struct Card6Component {
123 ProcessUtils.processPage(this.contentDTO) 123 ProcessUtils.processPage(this.contentDTO)
124 }) 124 })
125 .padding({ 125 .padding({
126 - left: $r('app.float.card_comp_pagePadding_lf'),  
127 - right: $r('app.float.card_comp_pagePadding_lf'), 126 + left: 10,
  127 + right: 10,
128 top: $r('app.float.card_comp_pagePadding_tb'), 128 top: $r('app.float.card_comp_pagePadding_tb'),
129 bottom: $r('app.float.card_comp_pagePadding_tb') 129 bottom: $r('app.float.card_comp_pagePadding_tb')
130 }) 130 })
131 - 131 + .backgroundColor(0xffffff)
132 .width(CommonConstants.FULL_WIDTH) 132 .width(CommonConstants.FULL_WIDTH)
133 .height(this.contentDTO.appStyle === CompStyle.Card_13 ? '' : 184) 133 .height(this.contentDTO.appStyle === CompStyle.Card_13 ? '' : 184)
134 .justifyContent(FlexAlign.SpaceBetween) 134 .justifyContent(FlexAlign.SpaceBetween)
@@ -79,13 +79,14 @@ export struct SearchContentComponent { @@ -79,13 +79,14 @@ export struct SearchContentComponent {
79 //bottom 评论等信息 79 //bottom 评论等信息
80 CardSourceInfo({compDTO:new CompDTO, contentDTO: this.contentDTO }) 80 CardSourceInfo({compDTO:new CompDTO, contentDTO: this.contentDTO })
81 } 81 }
82 - .width(CommonConstants.FULL_WIDTH)  
83 .padding({ 82 .padding({
84 - left: $r('app.float.card_comp_pagePadding_lf'),  
85 - right: $r('app.float.card_comp_pagePadding_lf'), 83 + left: 10,
  84 + right: 10,
86 top: $r('app.float.card_comp_pagePadding_tb'), 85 top: $r('app.float.card_comp_pagePadding_tb'),
87 bottom: $r('app.float.card_comp_pagePadding_tb') 86 bottom: $r('app.float.card_comp_pagePadding_tb')
88 }) 87 })
  88 + .backgroundColor(0xffffff)
  89 + .width(CommonConstants.FULL_WIDTH)
89 } 90 }
90 } 91 }
91 92
@@ -33,8 +33,14 @@ export struct CompNormalTitle { @@ -33,8 +33,14 @@ export struct CompNormalTitle {
33 .margin({ top: 16, bottom: 10 }) 33 .margin({ top: 16, bottom: 10 })
34 .width(CommonConstants.FULL_WIDTH) 34 .width(CommonConstants.FULL_WIDTH)
35 } 35 }
  36 + .padding({
  37 + left: 10,
  38 + right: 10,
  39 + top: $r('app.float.card_comp_pagePadding_tb'),
  40 + bottom: $r('app.float.card_comp_pagePadding_tb')
  41 + })
  42 + .backgroundColor(0xffffff)
36 .width(CommonConstants.FULL_WIDTH) 43 .width(CommonConstants.FULL_WIDTH)
37 - .padding({ left: 16, right: 16 })  
38 44
39 } 45 }
40 } 46 }
@@ -154,13 +154,14 @@ export struct ZhCarouselLayout01 { @@ -154,13 +154,14 @@ export struct ZhCarouselLayout01 {
154 } 154 }
155 } 155 }
156 .alignContent(Alignment.BottomEnd) 156 .alignContent(Alignment.BottomEnd)
157 - .width(CommonConstants.FULL_WIDTH)  
158 .padding({ 157 .padding({
159 - left: $r('app.float.card_comp_pagePadding_lf'),  
160 - right: $r('app.float.card_comp_pagePadding_lf'), 158 + left: 10,
  159 + right: 10,
161 top: $r('app.float.card_comp_pagePadding_tb'), 160 top: $r('app.float.card_comp_pagePadding_tb'),
162 bottom: $r('app.float.card_comp_pagePadding_tb') 161 bottom: $r('app.float.card_comp_pagePadding_tb')
163 }) 162 })
  163 + .backgroundColor(0xffffff)
  164 + .width(CommonConstants.FULL_WIDTH)
164 .onClick((event: ClickEvent) => { 165 .onClick((event: ClickEvent) => {
165 InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[this.swiperIndex], this.pageId, this.pageName) 166 InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[this.swiperIndex], this.pageId, this.pageName)
166 Logger.info(TAG, `ZhCarouselLayout01 onClick event index: ${this.swiperIndex}`); 167 Logger.info(TAG, `ZhCarouselLayout01 onClick event index: ${this.swiperIndex}`);
@@ -37,7 +37,15 @@ export struct ZhGridLayout02NewsContent { @@ -37,7 +37,15 @@ export struct ZhGridLayout02NewsContent {
37 this.buildItemCard(item, index); 37 this.buildItemCard(item, index);
38 } 38 }
39 }) 39 })
40 - }.width("100%").padding({ left: 16, right: 16 }) 40 + }
  41 + .padding({
  42 + left: 10,
  43 + right: 10,
  44 + top: $r('app.float.card_comp_pagePadding_tb'),
  45 + bottom: $r('app.float.card_comp_pagePadding_tb')
  46 + })
  47 + .backgroundColor(0xffffff)
  48 + .width(CommonConstants.FULL_WIDTH)
41 49
42 } 50 }
43 51
@@ -43,11 +43,13 @@ export struct ZhGridLayout03 { @@ -43,11 +43,13 @@ export struct ZhGridLayout03 {
43 }) 43 })
44 } 44 }
45 .padding({ 45 .padding({
46 - left: $r('app.float.card_comp_pagePadding_lf'),  
47 - right: $r('app.float.card_comp_pagePadding_lf'), 46 + left: 10,
  47 + right: 10,
48 top: $r('app.float.card_comp_pagePadding_tb'), 48 top: $r('app.float.card_comp_pagePadding_tb'),
49 - bottom: '0vp' 49 + bottom: $r('app.float.card_comp_pagePadding_tb')
50 }) 50 })
  51 + .backgroundColor(0xffffff)
  52 + .width('100%')
51 } 53 }
52 54
53 /** 55 /**
@@ -44,13 +44,14 @@ export struct ZhSingleColumn04 { @@ -44,13 +44,14 @@ export struct ZhSingleColumn04 {
44 }) 44 })
45 } 45 }
46 } 46 }
47 - .width(CommonConstants.FULL_WIDTH)  
48 .padding({ 47 .padding({
49 - left: $r('app.float.card_comp_pagePadding_lf'),  
50 - right: $r('app.float.card_comp_pagePadding_lf'), 48 + left: 10,
  49 + right: 10,
51 top: $r('app.float.card_comp_pagePadding_tb'), 50 top: $r('app.float.card_comp_pagePadding_tb'),
52 bottom: $r('app.float.card_comp_pagePadding_tb') 51 bottom: $r('app.float.card_comp_pagePadding_tb')
53 }) 52 })
  53 + .backgroundColor(0xffffff)
  54 + .width('100%')
54 } 55 }
55 56
56 @Builder 57 @Builder
@@ -42,13 +42,14 @@ export struct ZhSingleColumn05 { @@ -42,13 +42,14 @@ export struct ZhSingleColumn05 {
42 WDRouterRule.jumpWithAction(taskAction) 42 WDRouterRule.jumpWithAction(taskAction)
43 }) 43 })
44 } 44 }
45 - .width(CommonConstants.FULL_WIDTH)  
46 .padding({ 45 .padding({
47 - left: $r('app.float.card_comp_pagePadding_lf'),  
48 - right: $r('app.float.card_comp_pagePadding_lf'), 46 + left: 10,
  47 + right: 10,
49 top: $r('app.float.card_comp_pagePadding_tb'), 48 top: $r('app.float.card_comp_pagePadding_tb'),
50 bottom: $r('app.float.card_comp_pagePadding_tb') 49 bottom: $r('app.float.card_comp_pagePadding_tb')
51 }) 50 })
  51 + .backgroundColor(0xffffff)
  52 + .width('100%')
52 53
53 } 54 }
54 } 55 }
@@ -194,12 +194,13 @@ export struct ZhSingleColumn09 { @@ -194,12 +194,13 @@ export struct ZhSingleColumn09 {
194 .justifyContent(FlexAlign.SpaceBetween) 194 .justifyContent(FlexAlign.SpaceBetween)
195 } 195 }
196 .padding({ 196 .padding({
197 - left: $r('app.float.card_comp_pagePadding_lf'),  
198 - right: $r('app.float.card_comp_pagePadding_lf'), 197 + left: 10,
  198 + right: 10,
199 top: $r('app.float.card_comp_pagePadding_tb'), 199 top: $r('app.float.card_comp_pagePadding_tb'),
200 bottom: $r('app.float.card_comp_pagePadding_tb') 200 bottom: $r('app.float.card_comp_pagePadding_tb')
201 }) 201 })
202 - .backgroundColor($r('app.color.white')) 202 + .backgroundColor(0xffffff)
  203 + .width('100%')
203 .visibility(this.selfClosed ? Visibility.None : Visibility.Visible) 204 .visibility(this.selfClosed ? Visibility.None : Visibility.Visible)
204 } 205 }
205 } 206 }
@@ -151,12 +151,13 @@ export struct ZhSingleRow02 { @@ -151,12 +151,13 @@ export struct ZhSingleRow02 {
151 }) 151 })
152 } 152 }
153 .padding({ 153 .padding({
154 - left: $r('app.float.card_comp_pagePadding_lf'),  
155 - // right: $r('app.float.card_comp_pagePadding_lf'),  
156 - top: 8,  
157 - bottom: 8 154 + left: 10,
  155 + // right: 10,
  156 + top: $r('app.float.card_comp_pagePadding_tb'),
  157 + bottom: $r('app.float.card_comp_pagePadding_tb')
158 }) 158 })
159 - .backgroundColor($r('app.color.white')) 159 + .backgroundColor(0xffffff)
  160 + .width('100%')
160 .margin({ bottom: 8 }) 161 .margin({ bottom: 8 })
161 } 162 }
162 163
@@ -222,12 +222,13 @@ export struct ZhSingleRow03 { @@ -222,12 +222,13 @@ export struct ZhSingleRow03 {
222 }) 222 })
223 } 223 }
224 .padding({ 224 .padding({
225 - left: $r('app.float.card_comp_pagePadding_lf'),  
226 - right: $r('app.float.card_comp_pagePadding_lf'), 225 + left: 10,
  226 + right: 10,
227 top: $r('app.float.card_comp_pagePadding_tb'), 227 top: $r('app.float.card_comp_pagePadding_tb'),
228 bottom: $r('app.float.card_comp_pagePadding_tb') 228 bottom: $r('app.float.card_comp_pagePadding_tb')
229 }) 229 })
230 - .backgroundColor($r('app.color.white')) 230 + .backgroundColor(0xffffff)
  231 + .width('100%')
231 } 232 }
232 233
233 @Builder 234 @Builder
@@ -91,8 +91,14 @@ export struct ZhSingleRow04 { @@ -91,8 +91,14 @@ export struct ZhSingleRow04 {
91 .edgeEffect(EdgeEffect.None) 91 .edgeEffect(EdgeEffect.None)
92 } 92 }
93 .width(CommonConstants.FULL_WIDTH) 93 .width(CommonConstants.FULL_WIDTH)
94 - .backgroundColor($r("app.color.white"))  
95 - .margin({ bottom: 8 }) 94 + .padding({
  95 + left: 10,
  96 + right: 10,
  97 + top: $r('app.float.card_comp_pagePadding_tb'),
  98 + bottom: $r('app.float.card_comp_pagePadding_tb')
  99 + })
  100 + .backgroundColor(0xffffff)
  101 + .width('100%')
96 } 102 }
97 } 103 }
98 104
@@ -53,13 +53,13 @@ export struct ZhSingleRow05 { @@ -53,13 +53,13 @@ export struct ZhSingleRow05 {
53 .height(170) 53 .height(170)
54 } 54 }
55 .padding({ 55 .padding({
56 - left: $r('app.float.card_comp_pagePadding_lf'),  
57 - // right: $r('app.float.card_comp_pagePadding_lf'), 56 + left: 10,
  57 + // right: 10,
58 top: $r('app.float.card_comp_pagePadding_tb'), 58 top: $r('app.float.card_comp_pagePadding_tb'),
59 bottom: $r('app.float.card_comp_pagePadding_tb') 59 bottom: $r('app.float.card_comp_pagePadding_tb')
60 }) 60 })
61 - .backgroundColor($r('app.color.white'))  
62 - .margin({ bottom: 8 }) 61 + .backgroundColor(0xffffff)
  62 + .width('100%')
63 } 63 }
64 64
65 @Builder 65 @Builder
@@ -166,12 +166,13 @@ export struct ZhSingleRow06 { @@ -166,12 +166,13 @@ export struct ZhSingleRow06 {
166 .width('100%') 166 .width('100%')
167 } 167 }
168 .padding({ 168 .padding({
169 - left: $r('app.float.card_comp_pagePadding_lf'),  
170 - right: $r('app.float.card_comp_pagePadding_lf'), 169 + left: 10,
  170 + right: 10,
171 top: $r('app.float.card_comp_pagePadding_tb'), 171 top: $r('app.float.card_comp_pagePadding_tb'),
172 bottom: $r('app.float.card_comp_pagePadding_tb') 172 bottom: $r('app.float.card_comp_pagePadding_tb')
173 }) 173 })
174 - .backgroundColor($r('app.color.white')) 174 + .backgroundColor(0xffffff)
  175 + .width('100%')
175 .onClick(() => { 176 .onClick(() => {
176 InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[0], this.pageId, this.pageName) 177 InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[0], this.pageId, this.pageName)
177 }) 178 })