developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
王士厅
abf95f82 1 parent 930ac2d4

fix: '我的'预约、消息修改ui修改

Inline Side-by-side
Showing 12 changed files with 145 additions and 236 deletions
@@ -40,25 +40,25 @@ export struct AppointmentListChildComponent { @@ -40,25 +40,25 @@ export struct AppointmentListChildComponent {
40 .aspectRatio(16 / 9) 40 .aspectRatio(16 / 9)
41 .objectFit(ImageFit.Auto) 41 .objectFit(ImageFit.Auto)
42 .interpolation(ImageInterpolation.High) 42 .interpolation(ImageInterpolation.High)
  43 + .borderRadius({
  44 + topLeft: 4,
  45 + topRight: 4
  46 + })
43 47
44 48
45 if (this.item.status == "wait") { 49 if (this.item.status == "wait") {
46 Row() { 50 Row() {
47 Row() { 51 Row() {
48 Image($r('app.media.reserve_icon')) 52 Image($r('app.media.reserve_icon'))
49 - // .width('27lpx')  
50 - .width(27)  
51 - // .height('27lpx')  
52 - .height(27) 53 + .width(14)
  54 + .height(14)
53 .objectFit(ImageFit.Auto) 55 .objectFit(ImageFit.Auto)
54 .interpolation(ImageInterpolation.High) 56 .interpolation(ImageInterpolation.High)
55 - // .margin({right:"6lpx"})  
56 - .margin({right: 6}) 57 + .margin({right: 3})
57 58
58 Text("预约") 59 Text("预约")
59 .fontWeight(400) 60 .fontWeight(400)
60 - // .fontSize('23lpx')  
61 - .fontSize(23) 61 + .fontSize(12)
62 .textShadow({ 62 .textShadow({
63 radius: 2, 63 radius: 2,
64 color: `rgba(0,0,0,0.3)`, 64 color: `rgba(0,0,0,0.3)`,
@@ -66,15 +66,11 @@ export struct AppointmentListChildComponent { @@ -66,15 +66,11 @@ export struct AppointmentListChildComponent {
66 offsetX:0 66 offsetX:0
67 }) 67 })
68 .fontColor($r('app.color.white')) 68 .fontColor($r('app.color.white'))
69 - // .lineHeight('31lpx')  
70 - .lineHeight(31) 69 + .lineHeight(16)
71 .layoutWeight(1) 70 .layoutWeight(1)
72 .textAlign(TextAlign.Start) 71 .textAlign(TextAlign.Start)
73 } 72 }
74 - // .width('94lpx')  
75 - .width(94)  
76 - // .margin({ bottom: '15lpx', right: '15lpx' })  
77 - .margin({ bottom: 15, right: 15 }) 73 + .margin({ bottom: 8, right: 8 })
78 .alignItems(VerticalAlign.Center) 74 .alignItems(VerticalAlign.Center)
79 }.width('100%') 75 }.width('100%')
80 .height('100%') 76 .height('100%')
@@ -82,22 +78,17 @@ export struct AppointmentListChildComponent { @@ -82,22 +78,17 @@ export struct AppointmentListChildComponent {
82 .justifyContent(FlexAlign.End) 78 .justifyContent(FlexAlign.End)
83 } 79 }
84 }.width('100%') 80 }.width('100%')
85 - // .height('376lpx')  
86 - .height(376) 81 + .height(196)
87 82
88 Column() { 83 Column() {
89 Text(this.item.title) 84 Text(this.item.title)
90 - // .fontWeight('400lpx')  
91 .fontWeight(400) 85 .fontWeight(400)
92 - // .fontSize('33lpx')  
93 - .fontSize(33) 86 + .fontSize(17)
94 .fontColor($r('app.color.color_222222')) 87 .fontColor($r('app.color.color_222222'))
95 - // .lineHeight('48lpx')  
96 - .lineHeight(48) 88 + .lineHeight(25)
97 .maxLines(2) 89 .maxLines(2)
98 .textOverflow({ overflow: TextOverflow.Ellipsis }) 90 .textOverflow({ overflow: TextOverflow.Ellipsis })
99 - // .margin({ bottom: '23lpx' })  
100 - .margin({ bottom: 23 }) 91 + .margin({ bottom: 12 })
101 .textAlign(TextAlign.Start) 92 .textAlign(TextAlign.Start)
102 .width('100%') 93 .width('100%')
103 Row() { 94 Row() {
@@ -106,144 +97,105 @@ export struct AppointmentListChildComponent { @@ -106,144 +97,105 @@ export struct AppointmentListChildComponent {
106 Image($r('app.media.play_status_history_icon')) 97 Image($r('app.media.play_status_history_icon'))
107 .objectFit(ImageFit.Auto) 98 .objectFit(ImageFit.Auto)
108 .interpolation(ImageInterpolation.High) 99 .interpolation(ImageInterpolation.High)
109 - // .width('38lpx')  
110 - .width(38)  
111 - // .height('38lpx')  
112 - .height(38)  
113 - // .margin({ right: '12lpx' })  
114 - .margin({ right: 12 }) 100 + .width(20)
  101 + .height(20)
  102 + .margin({ right: 6 })
115 Text('已结束').fontColor($r('app.color.color_999999')) 103 Text('已结束').fontColor($r('app.color.color_999999'))
116 - // .fontWeight('500lpx')  
117 .fontWeight(500) 104 .fontWeight(500)
118 - // .fontSize('23lpx')  
119 - .fontSize(23) 105 + .fontSize(12)
  106 + .lineHeight(16)
120 }else if(this.item.status == "running"){ 107 }else if(this.item.status == "running"){
121 Image($r('app.media.play_status_icon')) 108 Image($r('app.media.play_status_icon'))
122 .objectFit(ImageFit.Auto) 109 .objectFit(ImageFit.Auto)
123 .interpolation(ImageInterpolation.High) 110 .interpolation(ImageInterpolation.High)
124 - // .width('38lpx')  
125 - .width(38)  
126 - // .height('38lpx')  
127 - .height(38)  
128 - // .margin({ right: '12lpx' })  
129 - .margin({ right: 12 })  
130 - Text('已开始').fontColor($r('app.color.color_999999'))  
131 - // .fontWeight('500lpx') 111 + .width(20)
  112 + .height(20)
  113 + .margin({ right: 6 })
  114 + Text('已开始').fontColor($r('app.color.color_ED2800'))
132 .fontWeight(500) 115 .fontWeight(500)
133 - // .fontSize('23lpx')  
134 - .fontSize(23) 116 + .fontSize(12)
  117 + .lineHeight(16)
135 } else { 118 } else {
136 Image($r('app.media.play_status_icon')) 119 Image($r('app.media.play_status_icon'))
137 .objectFit(ImageFit.Auto) 120 .objectFit(ImageFit.Auto)
138 .interpolation(ImageInterpolation.High) 121 .interpolation(ImageInterpolation.High)
139 - // .width('38lpx')  
140 - .width(38)  
141 - // .height('38lpx')  
142 - .height(38)  
143 - // .margin({ right: '12lpx' })  
144 - .margin({ right: 12 }) 122 + .width(20)
  123 + .height(20)
  124 + .margin({ right: 6 })
145 Text(this.item.timePre).fontColor($r('app.color.color_ED2800')) 125 Text(this.item.timePre).fontColor($r('app.color.color_ED2800'))
146 - // .fontWeight('500lpx')  
147 .fontWeight(500) 126 .fontWeight(500)
148 - // .fontSize('23lpx')  
149 - .fontSize(23) 127 + .fontSize(12)
  128 + .lineHeight(16)
150 Image($r('app.media.point_icon')) 129 Image($r('app.media.point_icon'))
151 .objectFit(ImageFit.Auto) 130 .objectFit(ImageFit.Auto)
152 .interpolation(ImageInterpolation.High) 131 .interpolation(ImageInterpolation.High)
153 - // .width('12lpx')  
154 - .width(12)  
155 - // .height('31lpx')  
156 - .height(31)  
157 - // .margin({ right: '4lpx' })  
158 - .margin({ right: 4 }) 132 + .width(6)
  133 + .height(16)
  134 + .margin({ right: 2 })
159 Text(`${this.item.timeBack}开始`).fontColor($r('app.color.color_ED2800')) 135 Text(`${this.item.timeBack}开始`).fontColor($r('app.color.color_ED2800'))
160 - // .fontWeight('500lpx')  
161 .fontWeight(500) 136 .fontWeight(500)
162 - // .fontSize('23lpx')  
163 - .fontSize(23)  
164 - // .lineHeight('31lpx')  
165 - .lineHeight(31) 137 + .fontSize(12)
  138 + .lineHeight(16)
166 } 139 }
167 } 140 }
168 - // .padding({ left: '19lpx', right: '19lpx' })  
169 - .padding({ left: 19, right: 19 })  
170 - // .height('46lpx')  
171 - .height(46) 141 + .height(24)
  142 + .width(82)
  143 + .padding({ left: 10, right: 10})
172 .alignItems(VerticalAlign.Center) 144 .alignItems(VerticalAlign.Center)
173 .backgroundColor($r('app.color.color_F5F5F5')) 145 .backgroundColor($r('app.color.color_F5F5F5'))
174 - // .borderRadius('4lpx')  
175 - .borderRadius(4) 146 + .borderRadius(2)
176 147
177 Blank() 148 Blank()
178 .layoutWeight(1) 149 .layoutWeight(1)
179 if (this.item.status === "wait") { 150 if (this.item.status === "wait") {
180 Text(this.item.isAppointment ? "已预约" : "预约") 151 Text(this.item.isAppointment ? "已预约" : "预约")
181 .fontWeight(400) 152 .fontWeight(400)
182 - // .fontSize('23lpx')  
183 - .fontSize(23) 153 + .fontSize(12)
184 .backgroundColor(this.item.isAppointment ? $r('app.color.color_F5F5F5') : $r('app.color.color_ED2800')) 154 .backgroundColor(this.item.isAppointment ? $r('app.color.color_F5F5F5') : $r('app.color.color_ED2800'))
185 .fontColor(this.item.isAppointment ? $r('app.color.color_CCCCCC') : $r('app.color.white')) 155 .fontColor(this.item.isAppointment ? $r('app.color.color_CCCCCC') : $r('app.color.white'))
186 - // .lineHeight('31lpx')  
187 - .lineHeight(31) 156 + .lineHeight(18)
188 .textAlign(TextAlign.Center) 157 .textAlign(TextAlign.Center)
189 - // .width('100lpx')  
190 - .width(100)  
191 - // .height('46lpx')  
192 - .height(46)  
193 - // .borderRadius('6lpx')  
194 - .borderRadius(6) 158 + .width(52)
  159 + .height(24)
  160 + .borderRadius(3)
195 .onClick(() => { 161 .onClick(() => {
196 this.dialogController.open() 162 this.dialogController.open()
197 }) 163 })
198 }else if(this.item.status == "running"){ 164 }else if(this.item.status == "running"){
199 Text("去观看" ) 165 Text("去观看" )
200 .fontWeight(400) 166 .fontWeight(400)
201 - // .fontSize('23lpx')  
202 - .fontSize(23) 167 + .fontSize(12)
203 .backgroundColor($r('app.color.color_ED2800')) 168 .backgroundColor($r('app.color.color_ED2800'))
204 .fontColor($r('app.color.white')) 169 .fontColor($r('app.color.white'))
205 - // .lineHeight('31lpx')  
206 - .lineHeight(31) 170 + .lineHeight(18)
207 .textAlign(TextAlign.Center) 171 .textAlign(TextAlign.Center)
208 - // .width('100lpx')  
209 - .width(100)  
210 - // .height('46lpx')  
211 - .height(46)  
212 - // .borderRadius('6lpx')  
213 - .borderRadius(6) 172 + .width(52)
  173 + .height(24)
  174 + .borderRadius(3)
214 } else { 175 } else {
215 Text("看回放") 176 Text("看回放")
216 .fontWeight(400) 177 .fontWeight(400)
217 - // .fontSize('23lpx')  
218 - .fontSize(23) 178 + .fontSize(12)
219 .backgroundColor($r('app.color.color_ED2800')) 179 .backgroundColor($r('app.color.color_ED2800'))
220 .fontColor($r('app.color.white')) 180 .fontColor($r('app.color.white'))
221 - // .lineHeight('31lpx')  
222 - .lineHeight(31) 181 + .lineHeight(18)
223 .textAlign(TextAlign.Center) 182 .textAlign(TextAlign.Center)
224 - // .width('100lpx')  
225 - .width(100)  
226 - // .height('46lpx')  
227 - .height(46)  
228 - // .borderRadius('6lpx')  
229 - .borderRadius(6) 183 + .width(52)
  184 + .height(24)
  185 + .borderRadius(3)
230 } 186 }
231 } 187 }
232 } 188 }
233 .padding({ 189 .padding({
234 - // left: '23lpx',  
235 - left: 23,  
236 - // right: '23lpx',  
237 - right: 23,  
238 - // top: '15lpx',  
239 - top: 15,  
240 - // bottom: '23lpx'  
241 - bottom: 23 190 + left: 12,
  191 + right: 12,
  192 + top: 8,
  193 + bottom: 12
242 }) 194 })
243 - }.margin({ left: 10, right: 10 }) 195 + }
244 .backgroundColor($r('app.color.white')) 196 .backgroundColor($r('app.color.white'))
245 - // .borderRadius('8lpx')  
246 - .borderRadius(8) 197 + .borderRadius(4)
  198 + .margin({top: 8})
247 // } 199 // }
248 } 200 }
249 201
@@ -140,8 +140,7 @@ export struct AppointmentListUI { @@ -140,8 +140,7 @@ export struct AppointmentListUI {
140 .cachedCount(4) 140 .cachedCount(4)
141 .scrollBar(BarState.Off) 141 .scrollBar(BarState.Off)
142 .edgeEffect(EdgeEffect.None) 142 .edgeEffect(EdgeEffect.None)
143 - // .margin({ top: '23lpx', left: '23lpx', right: '23lpx'})  
144 - .margin({ top: 23, left: 23, right: 23}) 143 + .margin({ top: 4, left: 12, right: 12})
145 .layoutWeight(1) 144 .layoutWeight(1)
146 } 145 }
147 146
@@ -64,6 +64,7 @@ export struct FollowChildComponent{ @@ -64,6 +64,7 @@ export struct FollowChildComponent{
64 .fontSize(12) 64 .fontSize(12)
65 .fontWeight(400) 65 .fontWeight(400)
66 .lineHeight(16) 66 .lineHeight(16)
  67 + .margin({bottom: 4})
67 68
68 Text(`${this.data.introduction}`) 69 Text(`${this.data.introduction}`)
69 .fontColor($r('app.color.color_B0B0B0')) 70 .fontColor($r('app.color.color_B0B0B0'))
@@ -149,7 +150,7 @@ export struct FollowChildComponent{ @@ -149,7 +150,7 @@ export struct FollowChildComponent{
149 .alignItems(VerticalAlign.Top) 150 .alignItems(VerticalAlign.Top)
150 151
151 } 152 }
152 - .height(`${this.columnHeight}`) 153 + .height(105)
153 .justifyContent(FlexAlign.Start) 154 .justifyContent(FlexAlign.Start)
154 155
155 Divider() 156 Divider()
@@ -54,26 +54,18 @@ export struct FollowFirstTabsComponent{ @@ -54,26 +54,18 @@ export struct FollowFirstTabsComponent{
54 @Builder TabBuilder(index: number, item: FollowListItem) { 54 @Builder TabBuilder(index: number, item: FollowListItem) {
55 Stack(){ 55 Stack(){
56 Text(item.directoryName) 56 Text(item.directoryName)
57 - // .height('38lpx')  
58 - .height(38)  
59 - // .fontSize('33lpx')  
60 - .fontSize(33) 57 + .fontSize(18)
61 .fontWeight(this.currentIndex === index ? 600 : 400) 58 .fontWeight(this.currentIndex === index ? 600 : 400)
62 .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor) 59 .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
63 - // .lineHeight('38lpx')  
64 - .lineHeight(38) 60 + .lineHeight(20)
65 61
66 if(this.currentIndex === index){ 62 if(this.currentIndex === index){
67 Divider() 63 Divider()
68 - // .width('31lpx')  
69 - .width(31)  
70 - // .height('4lpx')  
71 - .height(4) 64 + .width(16)
  65 + .height(2)
72 .color('#ED2800') 66 .color('#ED2800')
73 - // .strokeWidth('4lpx')  
74 - .strokeWidth(4)  
75 - // .margin({top:'50lpx'})  
76 - .margin({top: 50}) 67 + .strokeWidth(2)
  68 + .margin({top: 35})
77 .id("divTag") 69 .id("divTag")
78 } 70 }
79 }.onClick(()=>{ 71 }.onClick(()=>{
@@ -83,10 +75,7 @@ export struct FollowFirstTabsComponent{ @@ -83,10 +75,7 @@ export struct FollowFirstTabsComponent{
83 trackTabFirstClick(item.directoryName) 75 trackTabFirstClick(item.directoryName)
84 }) 76 })
85 .height('100%') 77 .height('100%')
86 - // .margin({right:'9lpx'})  
87 - .margin({right: 9})  
88 - // .padding({left:'31lpx',right:index === this.data.length-1?"31lpx":"0lpx"})  
89 - .padding({left: 31,right:index === this.data.length-1 ? 31 : 0}) 78 + .padding({left: 16,right:index === this.data.length-1 ? 16 : 0})
90 } 79 }
91 80
92 build() { 81 build() {
@@ -111,8 +100,7 @@ export struct FollowFirstTabsComponent{ @@ -111,8 +100,7 @@ export struct FollowFirstTabsComponent{
111 }.listDirection(Axis.Horizontal) 100 }.listDirection(Axis.Horizontal)
112 .backgroundColor($r('app.color.white')) 101 .backgroundColor($r('app.color.white'))
113 .width("100%") 102 .width("100%")
114 - .height(84)  
115 - // .height("84lpx") 103 + .height(44)
116 .edgeEffect(EdgeEffect.None) 104 .edgeEffect(EdgeEffect.None)
117 .scrollBar(BarState.Off) 105 .scrollBar(BarState.Off)
118 106
@@ -99,14 +99,12 @@ export struct FollowListDetailUI { @@ -99,14 +99,12 @@ export struct FollowListDetailUI {
99 ListItem() { 99 ListItem() {
100 ListHasNoMoreDataUI() 100 ListHasNoMoreDataUI()
101 } 101 }
102 - // .margin({bottom:"40lpx"})  
103 - .margin({bottom: 40}) 102 + .margin({bottom: 20})
104 } 103 }
105 } 104 }
106 .edgeEffect(EdgeEffect.None) 105 .edgeEffect(EdgeEffect.None)
107 .cachedCount(5) 106 .cachedCount(5)
108 - // .padding({ left: '31lpx', right: '31lpx' })  
109 - .padding({ left: 31, right: 31 }) 107 + .padding({ left: 16, right: 16 })
110 .layoutWeight(1) 108 .layoutWeight(1)
111 .scrollBar(BarState.Off) 109 .scrollBar(BarState.Off)
112 .onReachEnd(() => { 110 .onReachEnd(() => {
@@ -18,7 +18,6 @@ export struct FollowSecondTabsComponent{ @@ -18,7 +18,6 @@ export struct FollowSecondTabsComponent{
18 Column(){ 18 Column(){
19 Text().backgroundColor($r('app.color.color_EDEDED')) 19 Text().backgroundColor($r('app.color.color_EDEDED'))
20 .width('100%') 20 .width('100%')
21 - // .height('2lpx')  
22 .height(2) 21 .height(2)
23 22
24 if(this.data != null){ 23 if(this.data != null){
@@ -94,25 +93,19 @@ export struct FollowSecondTabsComponent{ @@ -94,25 +93,19 @@ export struct FollowSecondTabsComponent{
94 Column(){ 93 Column(){
95 Text(item.directoryName) 94 Text(item.directoryName)
96 .width('100%') 95 .width('100%')
97 - // .height('38lpx')  
98 - .height(38)  
99 - // .fontSize('30lpx')  
100 - .fontSize(30) 96 + .fontSize(14)
101 .textAlign(TextAlign.Center) 97 .textAlign(TextAlign.Center)
102 .fontWeight(this.currentIndex === index ? 600 : 400) 98 .fontWeight(this.currentIndex === index ? 600 : 400)
103 .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor) 99 .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
104 - // .lineHeight('38lpx')  
105 - .lineHeight(38) 100 + .lineHeight(22)
106 } 101 }
107 .onClick(()=>{ 102 .onClick(()=>{
108 this.currentIndex = index 103 this.currentIndex = index
109 this.swiperController.changeIndex(this.currentIndex) 104 this.swiperController.changeIndex(this.currentIndex)
110 }) 105 })
111 .justifyContent(FlexAlign.Center) 106 .justifyContent(FlexAlign.Center)
112 - // .height('84lpx')  
113 - .height(84)  
114 - // .width('140lpx')  
115 - .width(140) 107 + .height(50)
  108 + .width(80)
116 .backgroundColor(this.currentIndex === index?$r('app.color.white'):$r('app.color.color_F9F9F9')) 109 .backgroundColor(this.currentIndex === index?$r('app.color.white'):$r('app.color.color_F9F9F9'))
117 } 110 }
118 111
@@ -29,22 +29,22 @@ export struct FollowThirdTabsComponent{ @@ -29,22 +29,22 @@ export struct FollowThirdTabsComponent{
29 Column(){ 29 Column(){
30 Row(){ 30 Row(){
31 Image(index === 0?$r("app.media.ic_collect_left_left"):(index === this.data[this.firstIndex].children[this.secondIndex].children.length-1?$r('app.media.ic_collect_right_left'):$r('app.media.ic_collect_mid_left'))) 31 Image(index === 0?$r("app.media.ic_collect_left_left"):(index === this.data[this.firstIndex].children[this.secondIndex].children.length-1?$r('app.media.ic_collect_right_left'):$r('app.media.ic_collect_mid_left')))
32 - .width(index === 0?"19lpx":"35lpx")  
33 - .height('61lpx') 32 + .width(index === 0? 10 : 18)
  33 + .height(32)
34 .objectFit(ImageFit.Fill) 34 .objectFit(ImageFit.Fill)
35 35
36 Text(item.directoryName) 36 Text(item.directoryName)
37 - .fontSize('27lpx') 37 + .fontSize(14)
38 .fontWeight(this.currentIndex === index ? 600 : 400) 38 .fontWeight(this.currentIndex === index ? 600 : 400)
39 .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor) 39 .fontColor(this.currentIndex === index ? this.selectedFontColor : this.fontColor)
40 - .lineHeight('35lpx') 40 + .lineHeight(18)
41 .backgroundImage($r('app.media.ic_collect_mid')) 41 .backgroundImage($r('app.media.ic_collect_mid'))
42 .backgroundImageSize(ImageSize.Cover) 42 .backgroundImageSize(ImageSize.Cover)
43 - .padding({top:"13lpx",bottom:"13lpx"}) 43 + .padding({top:7,bottom:7})
44 44
45 Image(index === 0?$r("app.media.ic_collect_left_right"):(index === this.data[this.firstIndex].children[this.secondIndex].children.length-1?$r('app.media.ic_collect_right_right'):$r('app.media.ic_collect_mid_right'))) 45 Image(index === 0?$r("app.media.ic_collect_left_right"):(index === this.data[this.firstIndex].children[this.secondIndex].children.length-1?$r('app.media.ic_collect_right_right'):$r('app.media.ic_collect_mid_right')))
46 - .width(index === this.data[this.firstIndex].children[this.secondIndex].children.length-1?"19lpx":"35lpx")  
47 - .height('61lpx') 46 + .width(index === this.data[this.firstIndex].children[this.secondIndex].children.length-1 ? 10 : 18)
  47 + .height(32)
48 .objectFit(ImageFit.Fill) 48 .objectFit(ImageFit.Fill)
49 } 49 }
50 } 50 }
@@ -53,8 +53,8 @@ export struct FollowThirdTabsComponent{ @@ -53,8 +53,8 @@ export struct FollowThirdTabsComponent{
53 this.swiperController.changeIndex(this.currentIndex) 53 this.swiperController.changeIndex(this.currentIndex)
54 this.listScroller.scrollToIndex(index, true, ScrollAlign.CENTER) 54 this.listScroller.scrollToIndex(index, true, ScrollAlign.CENTER)
55 }) 55 })
56 - .offset({x:index === 0?"0lpx":"-5lpx"})  
57 - .height('80lpx') 56 + .offset({x: -5})
  57 + .height(84)
58 .justifyContent(FlexAlign.End) 58 .justifyContent(FlexAlign.End)
59 } 59 }
60 60
@@ -76,10 +76,8 @@ export struct FollowThirdTabsComponent{ @@ -76,10 +76,8 @@ export struct FollowThirdTabsComponent{
76 .scrollBar(BarState.Off) 76 .scrollBar(BarState.Off)
77 .listDirection(Axis.Horizontal) 77 .listDirection(Axis.Horizontal)
78 .width('100%') 78 .width('100%')
79 - // .height("84lpx")  
80 .height(84) 79 .height(84)
81 - // .padding({left:'31lpx',right:'48lpx'})  
82 - .padding({left: 31,right: 48}) 80 + .padding({left: 16,right: 25})
83 81
84 // Column() { 82 // Column() {
85 // // 页签 83 // // 页签
@@ -84,24 +84,26 @@ export struct HomePageBottomFollowComponent { @@ -84,24 +84,26 @@ export struct HomePageBottomFollowComponent {
84 } 84 }
85 85
86 Row() { 86 Row() {
87 - Text("关注更多人民号")  
88 - .fontWeight(400)  
89 - .fontColor($r('app.color.color_222222'))  
90 - .lineHeight(20)  
91 - .fontSize(14)  
92 - .textAlign(TextAlign.Center)  
93 - .margin({ right: 2 })  
94 - Image($r('app.media.arrow_icon_right'))  
95 - .objectFit(ImageFit.Auto)  
96 - .width(14)  
97 - .height(14) 87 + Row(){
  88 + Text("关注更多人民号")
  89 + .fontWeight(400)
  90 + .fontColor($r('app.color.color_222222'))
  91 + .lineHeight(20)
  92 + .fontSize(14)
  93 + .textAlign(TextAlign.Center)
  94 + .margin({ right: 2 })
  95 + Image($r('app.media.arrow_icon_right'))
  96 + .objectFit(ImageFit.Auto)
  97 + .width(14)
  98 + .height(14)
  99 + }
  100 + .backgroundColor($r('app.color.color_F5F5F5'))
  101 + .height(36)
  102 + .width('100%')
  103 + .alignItems(VerticalAlign.Center)
  104 + .justifyContent(FlexAlign.Center)
98 } 105 }
99 - .height(36)  
100 - .width(343)  
101 - .alignItems(VerticalAlign.Center)  
102 - .justifyContent(FlexAlign.Center)  
103 - .backgroundColor($r('app.color.color_F5F5F5'))  
104 - .margin({ top: 10, bottom: 2 }) 106 + .margin({ top: 10, bottom: 2, left: 16, right: 16})
105 .onClick(() => { 107 .onClick(() => {
106 let params = { 'index': "1" } as Record<string, string> 108 let params = { 'index': "1" } as Record<string, string>
107 WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params) 109 WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params)
@@ -158,11 +160,11 @@ export struct HomePageBottomFollowComponent { @@ -158,11 +160,11 @@ export struct HomePageBottomFollowComponent {
158 .height(14) 160 .height(14)
159 } 161 }
160 .height(36) 162 .height(36)
161 - .width(343) 163 + .width('100%')
162 .alignItems(VerticalAlign.Center) 164 .alignItems(VerticalAlign.Center)
163 .justifyContent(FlexAlign.Center) 165 .justifyContent(FlexAlign.Center)
164 .backgroundColor($r('app.color.color_F5F5F5')) 166 .backgroundColor($r('app.color.color_F5F5F5'))
165 - .margin({ top: 10, bottom: 2 }) 167 + .margin({ top: 10, bottom: 2})
166 }.onClick(() => { 168 }.onClick(() => {
167 let params = { 'index': "1" } as Record<string, string> 169 let params = { 'index': "1" } as Record<string, string>
168 WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params) 170 WDRouterRule.jumpWithPage(WDRouterPage.followListPage, params)
@@ -15,91 +15,72 @@ export struct MessageListItemUI { @@ -15,91 +15,72 @@ export struct MessageListItemUI {
15 Row() { 15 Row() {
16 Image(this.item.imgSrc) 16 Image(this.item.imgSrc)
17 .objectFit(ImageFit.Auto) 17 .objectFit(ImageFit.Auto)
18 - // .width('92lpx')  
19 - .width(92)  
20 - // .height('92lpx')  
21 - .height(92)  
22 - // .margin({ right: '15lpx' })  
23 - .margin({ right: 15 }) 18 + .width(48)
  19 + .height(48)
  20 + .margin({ right: 8 })
24 21
25 Column() { 22 Column() {
26 Text(this.item.title) 23 Text(this.item.title)
27 .fontWeight(500) 24 .fontWeight(500)
28 - // .fontSize('31lpx')  
29 - .fontSize(31)  
30 - // .lineHeight('42lpx')  
31 - .lineHeight(42) 25 + .fontSize(16)
  26 + .lineHeight(22)
32 .fontColor($r('app.color.color_222222')) 27 .fontColor($r('app.color.color_222222'))
33 .maxLines(1) 28 .maxLines(1)
34 - // .margin({ bottom: StringUtils.isNotEmpty(this.item.desc)?'8lpx':0 })  
35 - .margin({ bottom: StringUtils.isNotEmpty(this.item.desc) ? 8 : 0 }) 29 + .margin({ bottom: StringUtils.isNotEmpty(this.item.desc) ? 4 : 0 })
36 30
37 if(StringUtils.isNotEmpty(this.item.desc)){ 31 if(StringUtils.isNotEmpty(this.item.desc)){
38 Text(`${this.item.desc}`) 32 Text(`${this.item.desc}`)
39 .fontColor($r('app.color.color_999999')) 33 .fontColor($r('app.color.color_999999'))
40 - // .fontSize('27lpx')  
41 - .fontSize(27)  
42 - // .lineHeight('38lpx')  
43 - .lineHeight(38) 34 + .fontSize(14)
  35 + .lineHeight(20)
44 .fontWeight(400) 36 .fontWeight(400)
45 .maxLines(1) 37 .maxLines(1)
46 .textOverflow({ overflow: TextOverflow.Ellipsis }) 38 .textOverflow({ overflow: TextOverflow.Ellipsis })
47 } 39 }
48 } 40 }
49 - // .height('92lpx')  
50 - .height(92)  
51 .layoutWeight(1) 41 .layoutWeight(1)
52 .alignItems(HorizontalAlign.Start) 42 .alignItems(HorizontalAlign.Start)
53 .justifyContent(StringUtils.isNotEmpty(this.item.desc)?FlexAlign.Start:FlexAlign.Center) 43 .justifyContent(StringUtils.isNotEmpty(this.item.desc)?FlexAlign.Start:FlexAlign.Center)
  44 + .height(46)
54 }.layoutWeight(1) 45 }.layoutWeight(1)
55 46
56 Column() { 47 Column() {
57 Text(`${this.item.time}`) 48 Text(`${this.item.time}`)
58 .fontColor($r('app.color.color_999999')) 49 .fontColor($r('app.color.color_999999'))
59 - // .fontSize('23lpx')  
60 - .fontSize(23)  
61 - .fontWeight(500)  
62 - // .lineHeight('35lpx')  
63 - .lineHeight(35)  
64 - // .margin({ bottom: this.item.unReadCount > 0 ?'8lpx':0 })  
65 - .margin({ bottom: this.item.unReadCount > 0 ? 8 : 0 }) 50 + .fontSize(14)
  51 + .fontWeight(400)
  52 + .lineHeight(20)
  53 + .margin({ bottom: this.item.unReadCount > 0 ? 4 : 0 })
66 54
67 if(this.item.unReadCount > 0){ 55 if(this.item.unReadCount > 0){
68 Button(){ 56 Button(){
69 Text(`${this.item.unReadCount}`) 57 Text(`${this.item.unReadCount}`)
70 .fontWeight(400) 58 .fontWeight(400)
71 - // .fontSize("18lpx")  
72 - .fontSize(18) 59 + .fontSize(14)
73 .fontColor($r('app.color.white')) 60 .fontColor($r('app.color.white'))
74 } 61 }
75 .type((this.item.unReadCount>0 && this.item.unReadCount < 10 ? ButtonType.Circle:ButtonType.Capsule)) 62 .type((this.item.unReadCount>0 && this.item.unReadCount < 10 ? ButtonType.Circle:ButtonType.Capsule))
76 .backgroundColor($r("app.color.color_ED2800")) 63 .backgroundColor($r("app.color.color_ED2800"))
77 .stateEffect(false) 64 .stateEffect(false)
78 - // .height("27lpx")  
79 - .height(27)  
80 - // .constraintSize({minWidth:"27lpx"})  
81 - .constraintSize({minWidth: 27}) 65 + .height(16)
  66 + .constraintSize({minWidth: 16})
82 } 67 }
83 } 68 }
84 .justifyContent(FlexAlign.Start) 69 .justifyContent(FlexAlign.Start)
85 .alignItems(HorizontalAlign.End) 70 .alignItems(HorizontalAlign.End)
86 - // .height('92lpx')  
87 - .height(92) 71 + .height(46)
88 } 72 }
89 .width('100%') 73 .width('100%')
90 - // .height('92lpx')  
91 - .height(92) 74 + .height(46)
92 .justifyContent(FlexAlign.SpaceBetween) 75 .justifyContent(FlexAlign.SpaceBetween)
93 76
94 } 77 }
95 - // .height('154lpx')  
96 - .height(154) 78 + .height(80)
97 .width("100%") 79 .width("100%")
98 .justifyContent(FlexAlign.Center) 80 .justifyContent(FlexAlign.Center)
99 81
100 Text().backgroundColor($r('app.color.color_EDEDED')) 82 Text().backgroundColor($r('app.color.color_EDEDED'))
101 .width('100%') 83 .width('100%')
102 - // .height('1lpx')  
103 .height(1) 84 .height(1)
104 .visibility(this.index != 3 ?Visibility.Visible:Visibility.None) 85 .visibility(this.index != 3 ?Visibility.Visible:Visibility.None)
105 } 86 }
@@ -180,7 +180,7 @@ export struct MessageListUI { @@ -180,7 +180,7 @@ export struct MessageListUI {
180 ListItem() { 180 ListItem() {
181 MessageListItemUI({ item: item, index: index }) 181 MessageListItemUI({ item: item, index: index })
182 } 182 }
183 - .padding({ left: "31lpx", right: "31lpx" }) 183 + .padding({ left: 16, right: 16 })
184 .onClick(() => { 184 .onClick(() => {
185 this.messageCenterCommonButtonTracking(index) 185 this.messageCenterCommonButtonTracking(index)
186 switch (index) { 186 switch (index) {
@@ -202,7 +202,7 @@ export struct MessageListUI { @@ -202,7 +202,7 @@ export struct MessageListUI {
202 break; 202 break;
203 } 203 }
204 }) 204 })
205 - .height('154lpx') 205 + .height(80)
206 .width("100%") 206 .width("100%")
207 }) 207 })
208 } 208 }
@@ -148,6 +148,10 @@ struct MyCollectionListPage { @@ -148,6 +148,10 @@ struct MyCollectionListPage {
148 .scrollBar(BarState.Off) 148 .scrollBar(BarState.Off)
149 .height(CommonConstants.FULL_PARENT) 149 .height(CommonConstants.FULL_PARENT)
150 .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果 150 .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
  151 + .margin({
  152 + left: 16,
  153 + right: 16
  154 + })
151 } 155 }
152 156
153 @Builder 157 @Builder
@@ -159,7 +163,7 @@ struct MyCollectionListPage { @@ -159,7 +163,7 @@ struct MyCollectionListPage {
159 selectCallback:(isOn)=>{ 163 selectCallback:(isOn)=>{
160 this.addCompDTO(isOn,compDTO) 164 this.addCompDTO(isOn,compDTO)
161 } 165 }
162 - }).margin({left:16}) 166 + }).margin({right: 16})
163 } 167 }
164 Column() { 168 Column() {
165 BigPicCardComponent({compDTO:new CompDTO,contentDTO:compDTO,pageId:TrackConstants.PageName.My_Collect,pageName:TrackConstants.PageName.My_Collect}) 169 BigPicCardComponent({compDTO:new CompDTO,contentDTO:compDTO,pageId:TrackConstants.PageName.My_Collect,pageName:TrackConstants.PageName.My_Collect})
@@ -13,10 +13,8 @@ export struct CustomTitleAndEditUI { @@ -13,10 +13,8 @@ export struct CustomTitleAndEditUI {
13 //标题栏目 13 //标题栏目
14 if(this.imgBack){ 14 if(this.imgBack){
15 Image($r('app.media.back_icon')) 15 Image($r('app.media.back_icon'))
16 - // .width('46lpx')  
17 - .width(46)  
18 - // .height('46lpx')  
19 - .height(46) 16 + .width(24)
  17 + .height(24)
20 .objectFit(ImageFit.Auto) 18 .objectFit(ImageFit.Auto)
21 .interpolation(ImageInterpolation.High) 19 .interpolation(ImageInterpolation.High)
22 .id("back_icon") 20 .id("back_icon")
@@ -24,24 +22,19 @@ export struct CustomTitleAndEditUI { @@ -24,24 +22,19 @@ export struct CustomTitleAndEditUI {
24 center: {anchor: "__container__", align: VerticalAlign.Center}, 22 center: {anchor: "__container__", align: VerticalAlign.Center},
25 left: {anchor: "__container__", align: HorizontalAlign.Start} 23 left: {anchor: "__container__", align: HorizontalAlign.Start}
26 }) 24 })
27 - // .margin({left:'31lpx'})  
28 - .margin({left: 31}) 25 + .margin({left: 16})
29 .onClick(()=>{ 26 .onClick(()=>{
30 router.back() 27 router.back()
31 }) 28 })
32 } 29 }
33 30
34 Text(this.titleName) 31 Text(this.titleName)
35 - // .height('42lpx')  
36 - .height(42)  
37 .maxLines(1) 32 .maxLines(1)
38 .id("title") 33 .id("title")
39 - // .fontSize('35lpx')  
40 - .fontSize(35)  
41 - .fontWeight(400) 34 + .fontSize(18)
  35 + .fontWeight(500)
42 .fontColor($r('app.color.color_222222')) 36 .fontColor($r('app.color.color_222222'))
43 - // .lineHeight('42lpx')  
44 - .lineHeight(42) 37 + .lineHeight(26)
45 .alignRules({ 38 .alignRules({
46 center: {anchor: "__container__", align: VerticalAlign.Center}, 39 center: {anchor: "__container__", align: VerticalAlign.Center},
47 middle: {anchor: "__container__", align: HorizontalAlign.Center} 40 middle: {anchor: "__container__", align: HorizontalAlign.Center}
@@ -51,22 +44,22 @@ export struct CustomTitleAndEditUI { @@ -51,22 +44,22 @@ export struct CustomTitleAndEditUI {
51 Button(this.isEditState === true?'取消':'编辑') 44 Button(this.isEditState === true?'取消':'编辑')
52 .type(ButtonType.Normal) 45 .type(ButtonType.Normal)
53 .fontColor($r('app.color.color_222222')) 46 .fontColor($r('app.color.color_222222'))
  47 + .fontSize(16)
  48 + .height(20)
54 .backgroundColor(Color.White) 49 .backgroundColor(Color.White)
55 .id("edit_Button") 50 .id("edit_Button")
56 .alignRules({ 51 .alignRules({
57 center: {anchor: "__container__", align: VerticalAlign.Center}, 52 center: {anchor: "__container__", align: VerticalAlign.Center},
58 right: {anchor: "__container__", align: HorizontalAlign.End} 53 right: {anchor: "__container__", align: HorizontalAlign.End}
59 }) 54 })
60 - // .margin({right:'31lpx'})  
61 - .margin({right: 31}) 55 + .margin({right: 16})
62 .onClick(()=>{ 56 .onClick(()=>{
63 this.isEditState = !this.isEditState 57 this.isEditState = !this.isEditState
64 this.editCallback() 58 this.editCallback()
65 }) 59 })
66 } 60 }
67 } 61 }
68 - // .height('84lpx')  
69 - .height(84) 62 + .height(44)
70 .width('100%') 63 .width('100%')
71 .backgroundColor($r('app.color.white')) 64 .backgroundColor($r('app.color.white'))
72 65