developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
yangchenggong1_wd
5436b463 1 parent 97918a9c

fix:bug[17353] UI还原问题-【uat】进入重置密码，确认按钮颜色和android 不一致，看图，并且不可点击

Inline Side-by-side
Showing 5 changed files with 36 additions and 31 deletions
@@ -138,15 +138,16 @@ struct ChangeBindPhonePage { @@ -138,15 +138,16 @@ struct ChangeBindPhonePage {
138 Row() { 138 Row() {
139 Text("确认") 139 Text("确认")
140 .layoutWeight(1) 140 .layoutWeight(1)
141 - .fontColor(this.isSubmit ?"#FFFFFFFF":"#66FFFFFF") 141 + .fontColor("#FFFFFF")
142 .borderRadius(4) 142 .borderRadius(4)
143 .fontSize(18) 143 .fontSize(18)
144 .textAlign(TextAlign.Center) 144 .textAlign(TextAlign.Center)
145 .fontWeight(FontWeight.Medium) 145 .fontWeight(FontWeight.Medium)
146 .margin({ top: 26 }) 146 .margin({ top: 26 })
147 .height(44) 147 .height(44)
148 - .backgroundColor(this.isSubmit ?"#ED2800":"#99ED2800") 148 + .backgroundColor("#ED2800")
149 .enabled(this.isSubmit ? true : false) 149 .enabled(this.isSubmit ? true : false)
  150 + .opacity(this.isSubmit ? 1: 0.6)
150 .onClick(() => { 151 .onClick(() => {
151 TrackingButton.click("changePhoneNumberPageConfirm",TrackConstants.PageName.Change_PhoneNum,TrackConstants.PageName.Change_PhoneNum) 152 TrackingButton.click("changePhoneNumberPageConfirm",TrackConstants.PageName.Change_PhoneNum,TrackConstants.PageName.Change_PhoneNum)
152 this.changeBindPhone() 153 this.changeBindPhone()
@@ -60,15 +60,16 @@ struct ForgetPasswordPage { @@ -60,15 +60,16 @@ struct ForgetPasswordPage {
60 Row() { 60 Row() {
61 Text("确认") 61 Text("确认")
62 .layoutWeight(1) 62 .layoutWeight(1)
63 - .fontColor(this.isSubmit ?"#FFFFFFFF":"#66FFFFFF") 63 + .fontColor("#FFFFFF")
64 .borderRadius(4) 64 .borderRadius(4)
65 .fontSize(18) 65 .fontSize(18)
66 .textAlign(TextAlign.Center) 66 .textAlign(TextAlign.Center)
67 .fontWeight(FontWeight.Medium) 67 .fontWeight(FontWeight.Medium)
68 .margin({ top: 26 }) 68 .margin({ top: 26 })
69 .height(44) 69 .height(44)
70 - .backgroundColor(this.isSubmit ?"#ED2800":"#99ED2800") 70 + .backgroundColor("#ED2800")
71 .enabled(this.isSubmit ? true : false) 71 .enabled(this.isSubmit ? true : false)
  72 + .opacity(this.isSubmit ? 1: 0.6)
72 .onClick(() => { 73 .onClick(() => {
73 this.checkVerifyCode() 74 this.checkVerifyCode()
74 }) 75 })
@@ -161,7 +161,7 @@ struct LoginPage { @@ -161,7 +161,7 @@ struct LoginPage {
161 Row() { 161 Row() {
162 Text("登录") 162 Text("登录")
163 .borderRadius(4) 163 .borderRadius(4)
164 - .fontColor(this.isSubmit ? "#FFFFFFFF" : "#66FFFFFF") 164 + .fontColor("#FFFFFF")
165 .fontSize(`${this.calcHeight(31)}lpx`) 165 .fontSize(`${this.calcHeight(31)}lpx`)
166 .fontWeight(400) 166 .fontWeight(400)
167 .margin({ top: `${this.calcHeight(20)}` }) 167 .margin({ top: `${this.calcHeight(20)}` })
@@ -169,7 +169,8 @@ struct LoginPage { @@ -169,7 +169,8 @@ struct LoginPage {
169 .height(44) 169 .height(44)
170 .textAlign(TextAlign.Center) 170 .textAlign(TextAlign.Center)
171 .width("100%") 171 .width("100%")
172 - .backgroundColor(this.isSubmit ? "#FFED2800" : "#99ED2800") 172 + .backgroundColor("#ED2800")
  173 + .opacity(this.isSubmit ? 1: 0.6)
173 .onClick(() => { 174 .onClick(() => {
174 if (!this.isSubmit) { 175 if (!this.isSubmit) {
175 return 176 return
@@ -189,30 +189,30 @@ struct ModifyPasswordPage { @@ -189,30 +189,30 @@ struct ModifyPasswordPage {
189 .height(`${this.calcHeight(85)}lpx`) 189 .height(`${this.calcHeight(85)}lpx`)
190 .alignItems(HorizontalAlign.Start) 190 .alignItems(HorizontalAlign.Start)
191 191
  192 +
192 Row() { 193 Row() {
193 - Button( { type: ButtonType.Normal, stateEffect: true }){  
194 - Text("确认")  
195 - .fontColor("#fff")  
196 - .fontSize(`${this.calcHeight(35)}lpx`)  
197 - .lineHeight(`${this.calcHeight(50)}lpx`)  
198 - .opacity(this.btnStatus ?1:0.5)  
199 - }  
200 - .width('100%')  
201 - .height(`${this.calcHeight(80)}lpx`)  
202 - .backgroundColor(this.btnStatus ? '#ED2800' : '#99ED2800')  
203 - .enabled(this.btnStatus ?true:false)  
204 - .borderRadius('4vp') 194 + Text("确认")
  195 + .layoutWeight(1)
  196 + .fontColor("#FFFFFF")
  197 + .borderRadius(4)
  198 + .fontSize(18)
  199 + .textAlign(TextAlign.Center)
  200 + .fontWeight(FontWeight.Medium)
  201 + .margin({ top: 26 })
  202 + .height(44)
  203 + .backgroundColor("#ED2800")
  204 + .enabled(this.btnStatus ? true : false)
  205 + .opacity(this.btnStatus ? 1: 0.6)
205 .onClick(() => { 206 .onClick(() => {
206 if(this.btnStatus){ 207 if(this.btnStatus){
207 TrackingButton.click("changePasswordPageConfirm",TrackConstants.PageName.Change_Passwd,TrackConstants.PageName.Change_Passwd) 208 TrackingButton.click("changePasswordPageConfirm",TrackConstants.PageName.Change_Passwd,TrackConstants.PageName.Change_Passwd)
208 this.submit() 209 this.submit()
209 } 210 }
210 }) 211 })
211 - } 212 + }.width('100%')
212 .padding({top:`${this.calcHeight(25)}lpx`}) 213 .padding({top:`${this.calcHeight(25)}lpx`})
213 .alignItems(VerticalAlign.Center) 214 .alignItems(VerticalAlign.Center)
214 .width('100%') 215 .width('100%')
215 - .height(`${this.calcHeight(120)}lpx`)  
216 216
217 Column() { 217 Column() {
218 Text("忘记密码").fontSize(12).maxLines(3).fontColor(0x999999).padding({top:`${this.calcHeight(10)}lpx`}) 218 Text("忘记密码").fontSize(12).maxLines(3).fontColor(0x999999).padding({top:`${this.calcHeight(10)}lpx`})
@@ -290,21 +290,23 @@ export struct SettingPasswordPage { @@ -290,21 +290,23 @@ export struct SettingPasswordPage {
290 // 按钮 290 // 按钮
291 @Builder getButtonCell(item: AccoutPageDataModel) { 291 @Builder getButtonCell(item: AccoutPageDataModel) {
292 Row() { 292 Row() {
293 - Button(item.compButtonTitle, { type: ButtonType.Normal, stateEffect: true })  
294 - .width('100%')  
295 - .height('80lpx')  
296 - .backgroundColor(this.btnStatus ? '#da3e22' : '#e5856d')  
297 - .enabled(this.btnStatus ?true:false)  
298 - .fontColor('#fff')  
299 - .borderRadius('4vp') 293 + Text(item.compButtonTitle)
  294 + .layoutWeight(1)
  295 + .fontColor("#FFFFFF")
  296 + .borderRadius(4)
  297 + .fontSize(18)
  298 + .textAlign(TextAlign.Center)
  299 + .fontWeight(FontWeight.Medium)
  300 + .margin({ top: 26 })
  301 + .height(44)
  302 + .backgroundColor("#ED2800")
  303 + .enabled(this.btnStatus ? true : false)
  304 + .opacity(this.btnStatus ? 1: 0.6)
300 .onClick(() => { 305 .onClick(() => {
301 this.buttonClick() 306 this.buttonClick()
302 }) 307 })
303 - }  
304 - .padding({top:'25lpx'})  
305 - .alignItems(VerticalAlign.Center) 308 + }.padding({top:'25lpx'})
306 .width('100%') 309 .width('100%')
307 - .height('120lpx')  
308 } 310 }
309 311
310 // 标题 312 // 标题