From a607077e83562b37f671286b4595c26fb51e1b40 Mon Sep 17 00:00:00 2001
From: TM <923727421@qq.com>
Date: Wed, 16 Dec 2020 10:54:54 +0800
Subject: [PATCH] 修改按钮文字

---
 pages/forgetPassword/forgetPassword.js |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pages/forgetPassword/forgetPassword.js b/pages/forgetPassword/forgetPassword.js
index 1c9b612..2c948c2 100644
--- a/pages/forgetPassword/forgetPassword.js
+++ b/pages/forgetPassword/forgetPassword.js
@@ -50,11 +50,11 @@
       })
     }else if(code == 2){
       this.setData({
-        'info.newPwd':md5.hex_md5(e.detail.value) 
+        'info.newPwd':e.detail.value
       })
     }else{
       this.setData({
-        newPwdTwo: md5.hex_md5(e.detail.value)
+        newPwdTwo:e.detail.value
       })
     }
   },
@@ -89,7 +89,14 @@
     }
     if(!validator.checkPassword(this.data.info.newPwd)){
       my.showToast({
-        content: '密码为8-16数字字母组合',
+        content: '新密码为8-16数字字母组合',
+        duration: 2000
+      })
+      return
+    }
+    if(!this.data.newPwdTwo){
+      my.showToast({
+        content: '请再次输入新密码',
         duration: 2000
       })
       return
@@ -118,7 +125,9 @@
       err=>{},
       false,
       {
-        ...this.data.info
+        mblNo:this.data.info.mblNo,
+        verCode:this.data.info.verCode,
+        newPwd: md5.hex_md5(this.data.info.mblNo+this.data.info.newPwd)
       }
     )
   }

--
Gitblit v1.8.0