desc:抽离 验证手机号页面

@@ -68,6 +68,7 @@ export class WDRouterPage {
   static loginPage = new WDRouterPage("wdLogin", "ets/pages/login/LoginPage");
   static oneKeyLoginPage = new WDRouterPage("wdLogin", "ets/pages/login/OneKeyLoginPage");
   static forgetPasswordPage = new WDRouterPage("wdLogin", "ets/pages/login/ForgetPasswordPage");
+  static verifyPhoneNumberPage = new WDRouterPage("wdLogin", "ets/pages/login/VerifyPhoneNumberPage");
   static changeBindPhonePage = new WDRouterPage("wdLogin", "ets/pages/login/ChangeBindPhonePage");
   static modifyPasswordPage = new WDRouterPage("wdLogin", "ets/pages/login/ModifyPasswordPage");
   //我的  预约

@@ -213,8 +213,7 @@ export struct AccountAndSecurityLayout {
                   WDRouterRule.jumpWithPage(WDRouterPage.modifyPasswordPage)
                 }else{
                   //设置密码
-                  let pageType = {'pageType': 1} as Record<string, number>;
-                  WDRouterRule.jumpWithPage(WDRouterPage.forgetPasswordPage, pageType)
+                  WDRouterRule.jumpWithPage(WDRouterPage.verifyPhoneNumberPage)
                 }
               }else if (index == 3) {
                 trackButtonClick("accountManagementPageAccountCancellation")

@@ -10,7 +10,7 @@ export struct LoginInputComponent {
   @Link isCodeSend: boolean //验证码控件是否点击 默认没有 发送接口
   @Link isSubmit: boolean //是否可以提交
   isFirst:boolean=true//是否第一次获取验证码
-  pageType?:number; //0、登录->忘记密码 1、设置->重置密码  3、设置->更换手机号页面2
+  pageType?:number; //0、登录->忘记密码   3、设置->更换手机号页面2
   lastTime: number = 0
   @Link @Watch('startCount') codeStateSuccess: boolean  //验证码获取成功与否回调 成功显示倒计时
   @Watch('onCheckChange') @Prop protocolState: boolean = false //协议勾选状态
@@ -33,9 +33,6 @@ export struct LoginInputComponent {
   }
 
    async aboutToAppear(){
-     if (this.pageType == 1 ) {
-       this.phoneContent = await SPHelper.default.get(SpConstants.USER_PHONE,"") as string;
-     }
      if(this.pageType == 0 ){
         let phone = await SPHelper.default.get(SpConstants.USER_PHONE,"") as string
        if(StringUtils.isNotEmpty(phone)){
@@ -43,29 +40,9 @@ export struct LoginInputComponent {
        }
      }
    }
+
   @Builder
   addCodeLayout() {
-    if (this.pageType == 1){
-      TextInput({ text: this.securityPhone(this.phoneContent) })
-        .placeholderColor("#CCCCCC")
-        .fontSize(16)
-        .height(48)
-        .maxLength(11)
-        .margin({ top: 36 })
-        .backgroundColor("#F5F5F5")
-        .borderRadius(4)
-        .enabled(false)
-        .type(InputType.PhoneNumber)
-        .onChange((content) => {
-          this.phoneContent = content
-          this.isSubmit = (this.phoneContent.length >= 11 && this.codeContent.length >= 4)
-          if (content.length >= 11) {
-            this.codeBtnState = true
-          } else {
-            this.codeBtnState = false
-          }
-        })
-    }else{
       //修改密码 里面的 忘记密码（已登录）
       if(StringUtils.isNotEmpty(this.phoneContent) && this.phoneContent.indexOf("****")!=-1 && this.pageType == 0){
         TextInput({ text: this.securityPhone(this.phoneContent) })
@@ -115,7 +92,6 @@ export struct LoginInputComponent {
             }
           })
       }
-    }
 
 
     Row() {

+import { CustomToast, DateTimeUtils, Logger, SPHelper } from 'wdKit/Index'
+import { WDRouterRule, WDRouterPage } from 'wdRouter/Index'
+import { LoginViewModel } from './LoginViewModel'
+import { SettingPasswordParams } from './SettingPasswordLayout'
+import { router } from '@kit.ArkUI'
+import { SpConstants } from 'wdConstant/Index'
+
+const TAG = 'VerifyPhoneNumberPage'
+//设置密码（第一次）  验证当前手机号 页面
+@Entry
+@Component
+struct VerifyPhoneNumberPage {
+  @State phoneContent: string = ''
+  @State codeContent: string = ''
+  @State isSubmit: boolean = false //是否可以提交  默认不可以
+  loginViewModel: LoginViewModel = new LoginViewModel()
+  @State @Watch('onCodeSend') isCodeSend: boolean = false //验证码点击发送事件
+  @State pageTitle:string = '验证当前手机号';
+  @State @Watch('startCount') codeStateSuccess:boolean=false
+  lastTime: number = 0
+  @State codeBtnState: boolean = false
+  @State timeCount: number = 60
+  isFirst:boolean=true//是否第一次获取验证码
+
+  onCodeSend() {
+    if (this.isCodeSend) {
+      this.sendVerifyCode()
+    }
+  }
+
+  async aboutToAppear(): Promise<void> {
+    this.phoneContent = await SPHelper.default.get(SpConstants.USER_PHONE,"") as string;
+  }
+
+  @State toastText:string = ""
+  dialogToast: CustomDialogController = new CustomDialogController({
+    builder: CustomToast({
+      msg: this.toastText,
+    }),
+    autoCancel: false,
+    alignment: DialogAlignment.Center,
+    customStyle: true,
+    maskColor:"#00000000"
+  })
+
+
+  build() {
+    Column() {
+      Image($r('app.media.login_back_icon')).width(24).height(24).margin({ left: 15, top: 10 }).onClick(() => {
+        router.back()
+      })
+
+      Text(this.pageTitle).fontSize(22).fontColor('#333333').fontWeight(FontWeight.Bold).margin({ left: 25, top: 112 })
+
+      Column() {
+        TextInput({ text: this.securityPhone(this.phoneContent) })
+          .placeholderColor("#CCCCCC")
+          .fontSize(16)
+          .height(48)
+          .maxLength(11)
+          .margin({ top: 36 })
+          .backgroundColor("#F5F5F5")
+          .borderRadius(4)
+          .enabled(false)
+          .type(InputType.PhoneNumber)
+          .onChange((content) => {
+            this.phoneContent = content
+            this.isSubmit = (this.phoneContent.length >= 11 && this.codeContent.length >= 4)
+            if (content.length >= 11) {
+              this.codeBtnState = true
+            } else {
+              this.codeBtnState = false
+            }
+          })
+
+        Row() {
+          TextInput({ text: this.codeContent,placeholder: "验证码" })
+            .placeholderColor("#CCCCCC")
+            .layoutWeight(1)
+            .fontSize(16)
+            .height(48)
+            .type(InputType.Number)
+            .fontColor("#222222")
+            .backgroundColor("#00000000")
+            .borderRadius({ topLeft: 4, bottomLeft: 4 })
+            .onChange((value) => {
+              this.codeContent = value
+              this.isSubmit = (this.phoneContent.length >= 11 && this.codeContent.length >= 4)
+            })
+
+          Text(this.codeStateSuccess ? this.timeCount + "s" : this.isFirst?"发送验证码":'重新获取')
+            .fontColor(this.codeBtnState?'#ED2800':'#80ED2800')
+            .width(110)
+            .fontSize(14)
+            .fontWeight( FontWeight.Bold)
+            .height(48)
+            .textAlign(TextAlign.Center)
+            .enabled(this.codeStateSuccess?false:true)
+            .onClick(() => {
+              if (this.phoneContent.length < 11) {
+                return
+              }
+
+              let currentTime = DateTimeUtils.getTimeStamp()
+              if (currentTime - this.lastTime < 500) {
+                return
+              }
+              this.lastTime = currentTime;
+              this.isCodeSend = true
+
+            })
+
+
+        }.margin({ top: 12 })
+        .height(48)
+        .alignItems(VerticalAlign.Center)
+        .justifyContent(FlexAlign.Start)
+        .backgroundImage($r('app.media.code_login_bg'))
+        .backgroundImageSize({width:'100%',height:48})
+
+
+
+      }.width('100%').padding({ left: 25, right: 25 })
+
+      Row() {
+        Text("确认")
+          .layoutWeight(1)
+          .fontColor(this.isSubmit ?"#FFFFFFFF":"#66FFFFFF")
+          .borderRadius(4)
+          .fontSize(18)
+          .textAlign(TextAlign.Center)
+          .fontWeight(FontWeight.Medium)
+          .margin({ top: 26 })
+          .height(44)
+          .backgroundColor(this.isSubmit ?"#ED2800":"#99ED2800")
+          .enabled(this.isSubmit ? true : false)
+          .onClick(() => {
+            this.checkVerifyCode()
+          })
+      }.padding({ left: 25, right: 25 }).width('100%')
+
+    }.width('100%').height('100%').alignItems(HorizontalAlign.Start)
+  }
+
+  //发送验证码
+  sendVerifyCode() {
+    if (this.isEmpty(this.phoneContent)) {
+      return
+    }
+
+    this.loginViewModel.sendVerifyCodeByToken().then(()=>{
+      this.showToastTip("已发送")
+      this.codeStateSuccess=true
+      this.isCodeSend=false
+    }).catch((message: string)=>{
+      this.showToastTip(message)
+      this.codeStateSuccess=false
+      this.isCodeSend=false
+    })
+  }
+
+
+  //校验验证码
+  checkVerifyCode() {
+    if (!this.isSubmit) {
+      return
+    }
+    if (this.isEmpty(this.phoneContent)) {
+      return
+    }
+    if (this.isEmpty(this.codeContent)) {
+      return
+    }
+
+    this.loginViewModel.checkVerifyCodeByToken(this.codeContent).then(()=>{
+      let params: SettingPasswordParams = {
+        pageID:'1',
+        phoneContent:this.phoneContent,
+        codeContent:this.codeContent,
+        pageType:1
+      }
+      WDRouterRule.jumpWithPage(WDRouterPage.settingPasswordPage, params)
+    }).catch((message: string)=>{
+      this.showToastTip(message)
+    })
+  }
+
+  isEmpty(obj: undefined|null|string): boolean {
+    return (obj == undefined || obj == null || obj == '');
+  }
+
+  showToastTip(msg:string){
+    this.toastText = msg
+    this.dialogToast.open()
+  }
+
+  securityPhone(phoneNum:string):string{
+    let securityNum:string;
+    let needSecurityString = phoneNum.substring(3, phoneNum.length - 4);
+    securityNum = phoneNum.replace(needSecurityString,'****')
+    return securityNum;
+  }
+
+  startCount() {
+    this.isFirst = false
+    let time = setInterval(() => {
+      Logger.debug("倒计时：" + this.timeCount)
+      this.timeCount--
+      if (this.timeCount < 1) {
+        this.codeStateSuccess = false
+        this.timeCount = 60
+        clearInterval(time)
+      }
+    }, 1000)
+  }
+}
\ No newline at end of file

@@ -9,6 +9,7 @@
     "pages/guide/GuidePages",
     "pages/login/OneKeyLoginPage",
     "pages/login/ModifyPasswordPage",
-    "pages/login/ChangeBindPhonePage"
+    "pages/login/ChangeBindPhonePage",
+    "pages/login/VerifyPhoneNumberPage"
   ]
 }
\ No newline at end of file