隐私弹框优化

@@ -26,11 +26,13 @@ export struct CustomProtocolDialog {
         Span("《用户协议》").fontSize(14).fontColor("#ED2800").onClick(()=>{
         Span("《用户协议》").fontSize(14).fontColor("#ED2800").onClick(()=>{
           let bean={contentId:"1",pageID:""} as Params
           let bean={contentId:"1",pageID:""} as Params
           WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage,bean)
           WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage,bean)
+          this.controller.close()
         })
         })
         Span("及").fontSize(14).fontColor("#666666")
         Span("及").fontSize(14).fontColor("#666666")
         Span("《隐私政策》").fontSize(14).fontColor("#ED2800").onClick(()=>{
         Span("《隐私政策》").fontSize(14).fontColor("#ED2800").onClick(()=>{
           let bean={contentId:"2",pageID:""} as Params
           let bean={contentId:"2",pageID:""} as Params
           WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage,bean)
           WDRouterRule.jumpWithPage(WDRouterPage.loginProtocolPage,bean)
+          this.controller.close()
         })
         })
         Span("后进行登录").fontSize(14).fontColor("#666666")
         Span("后进行登录").fontSize(14).fontColor("#666666")
       }.margin({ top: 12, left: 16, right: 16 })
       }.margin({ top: 12, left: 16, right: 16 })

@@ -8,6 +8,7 @@ export struct LoginInputComponent {
   @State codeBtnState: boolean = false //发送验证码控件是否可以  默认不可用
   @State codeBtnState: boolean = false //发送验证码控件是否可以  默认不可用
   @Link isCodeSend: boolean //验证码控件是否点击 默认没有 发送接口
   @Link isCodeSend: boolean //验证码控件是否点击 默认没有 发送接口
   @Link isSubmit: boolean //是否可以提交
   @Link isSubmit: boolean //是否可以提交
+  isFirst:boolean=true//是否第一次获取验证码
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -50,7 +51,7 @@ export struct LoginInputComponent {
           this.isSubmit = (this.phoneContent.length >= 11 && this.codeContent.length >= 6)
           this.isSubmit = (this.phoneContent.length >= 11 && this.codeContent.length >= 6)
         })
         })
 
 
-      Text(this.isCodeSend ? this.timeCount + "s" : "发送验证码")
+      Text(this.isCodeSend ? this.timeCount + "s" : this.isFirst?"发送验证码":'重新发送')
         .backgroundImage($r('app.media.login_code_bg'), ImageRepeat.NoRepeat)
         .backgroundImage($r('app.media.login_code_bg'), ImageRepeat.NoRepeat)
         .backgroundImageSize(ImageSize.Cover)
         .backgroundImageSize(ImageSize.Cover)
         .fontColor('#ED2800')
         .fontColor('#ED2800')
@@ -65,6 +66,7 @@ export struct LoginInputComponent {
             return
             return
           }
           }
           this.isCodeSend = true
           this.isCodeSend = true
+          this.isFirst=false
           let time = setInterval(() => {
           let time = setInterval(() => {
             Logger.debug("倒计时：" + this.timeCount)
             Logger.debug("倒计时：" + this.timeCount)
             this.timeCount--
             this.timeCount--