developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
xugenyuan
b74edd5b 1 parent 8e27ca39

ref |> 调整一键登录页面UI 

Signed-off-by: xugenyuan <xugenyuan@wondertek.com.cn>
Inline Side-by-side
Showing 2 changed files with 18 additions and 9 deletions
@@ -52,10 +52,17 @@ struct OneKeyLoginPage { @@ -52,10 +52,17 @@ struct OneKeyLoginPage {
52 this.ProtocolRow() 52 this.ProtocolRow()
53 53
54 Row() { 54 Row() {
55 - Button("华为账号一键登录") 55 + Button() {
  56 + Row() {
  57 + Image($r("app.media.huawei_one_key_login_icon"))
  58 + .width(24).height(24)
  59 + Text("华为账号一键登录")
  60 + .fontColor(Color.White)
  61 + }
  62 + }
56 .type(ButtonType.Normal) 63 .type(ButtonType.Normal)
57 .height(48) 64 .height(48)
58 - .backgroundColor(!this.agreeProtocol ? Color.Grey : Color.Red) 65 + .backgroundColor(!this.agreeProtocol ? "#60ED2800" : "#ED2800")
59 .width("100%") 66 .width("100%")
60 .onClick((event) => { 67 .onClick((event) => {
61 if (!this.agreeProtocol) { 68 if (!this.agreeProtocol) {
@@ -67,7 +74,7 @@ struct OneKeyLoginPage { @@ -67,7 +74,7 @@ struct OneKeyLoginPage {
67 .padding({ left: 25, right: 25 }) 74 .padding({ left: 25, right: 25 })
68 .margin({top: 15}) 75 .margin({top: 15})
69 76
70 - Button("其他手机号登录") 77 + Button("账号密码登录")
71 .type(ButtonType.Normal) 78 .type(ButtonType.Normal)
72 .align(Alignment.Center) 79 .align(Alignment.Center)
73 .foregroundColor("#666666") 80 .foregroundColor("#666666")
@@ -83,28 +90,30 @@ struct OneKeyLoginPage { @@ -83,28 +90,30 @@ struct OneKeyLoginPage {
83 Image(this.agreeProtocol ? $r('app.media.login_checkbox_select') : $r('app.media.login_checkbox_unselected')) 90 Image(this.agreeProtocol ? $r('app.media.login_checkbox_select') : $r('app.media.login_checkbox_unselected'))
84 .width(15) 91 .width(15)
85 .height(15) 92 .height(15)
  93 + .margin({top: 3})
86 .onClick(() => { 94 .onClick(() => {
87 this.agreeProtocol = !this.agreeProtocol 95 this.agreeProtocol = !this.agreeProtocol
88 }) 96 })
89 Text() { 97 Text() {
90 - Span("我已阅读并同意").fontColor("#999999").fontSize(12)  
91 - Span("《用户协议》").fontColor("#ED2800").fontSize(12).onClick(() => { 98 + Span("我已阅读并同意").fontColor("#999999").fontSize(12).lineHeight(18)
  99 + Span("《用户协议》").fontColor("#ED2800").fontSize(12).lineHeight(18).onClick(() => {
92 let bean = { contentID: "1", pageID: "" } as Params 100 let bean = { contentID: "1", pageID: "" } as Params
93 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean) 101 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
94 }) 102 })
95 - Span("、").fontColor("#999999").fontSize(12)  
96 - Span("《隐私政策》").fontColor("#ED2800").fontSize(12).onClick(() => { 103 + Span("、").fontColor("#999999").fontSize(12).lineHeight(18)
  104 + Span("《隐私政策》").fontColor("#ED2800").fontSize(12).lineHeight(18).onClick(() => {
97 let bean = { contentID: "2", pageID: "" } as Params 105 let bean = { contentID: "2", pageID: "" } as Params
98 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean) 106 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
99 }) 107 })
100 - Span("和").fontColor("#999999").fontSize(12)  
101 - Span("《华为账号用户认证协议》").fontColor("#ED2800").fontSize(12).onClick(() => { 108 + Span("及").fontColor("#999999").fontSize(12).lineHeight(18)
  109 + Span("《华为账号用户认证协议》").fontColor("#ED2800").fontSize(12).lineHeight(18).onClick(() => {
102 let bean = { contentID: "4", pageID: "" } as Params 110 let bean = { contentID: "4", pageID: "" } as Params
103 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean) 111 WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage, bean)
104 }) 112 })
105 } 113 }
106 .layoutWeight(1) 114 .layoutWeight(1)
107 } 115 }
  116 + .alignItems(VerticalAlign.Top)
108 .margin({top: 15}) 117 .margin({top: 15})
109 .padding({ left: 25, right: 25 }) 118 .padding({ left: 25, right: 25 })
110 .width('100%') 119 .width('100%')