From b8f1913c5077437347ae3e311e01fbeb5e4dd5ff Mon Sep 17 00:00:00 2001
From: TM <923727421@qq.com>
Date: Wed, 16 Dec 2020 10:48:49 +0800
Subject: [PATCH] 添加密码格式验证

---
 pages/changePassword/changePassword.js |   98 +++++++++++++++++++++++++++++++++---------------
 1 files changed, 67 insertions(+), 31 deletions(-)

diff --git a/pages/changePassword/changePassword.js b/pages/changePassword/changePassword.js
index d5610e0..284a620 100644
--- a/pages/changePassword/changePassword.js
+++ b/pages/changePassword/changePassword.js
@@ -4,72 +4,108 @@
 const app = getApp()
 Page({
   data: {
-    userStyle:{},
-    newTwo:"",
-    info:{
-    	newPwd: "",
-    	oldPwd: ""
+    userStyle: {},
+    newTwo: "",
+    info: {
+      newPwd: "",
+      oldPwd: ""
     },
-    userInfo:{}
+    userInfo: {}
   },
   onLoad() {
     this.setData({
-      userStyle:app.userStyle,
-      userInfo:app.userInfo
+      userStyle: app.userStyle,
+      userInfo: app.userInfo
     })
   },
-  getOld(e){
+  getOld(e) {
     this.setData({
-      'info.oldPwd':e.detail.value
+      'info.oldPwd': e.detail.value
     })
   },
-  getNem(e){
+  getNem(e) {
     this.setData({
-      'info.newPwd':e.detail.value
+      'info.newPwd': e.detail.value
     })
   },
-  getNemTwo(e){
+  getNemTwo(e) {
     this.setData({
       newTwo: e.detail.value
     })
   },
-  save(){
-    console.log(this.data.userInfo.mblNo,this.data.newTwo,this.data.info)
-    if(validator.checkValEmpty(this.data.info.oldPwd)){
+  save() {
+    let self = this
+    console.log(this.data.userInfo.mblNo, this.data.newTwo, this.data.info)
+    if (validator.checkValEmpty(this.data.info.oldPwd)) {
       my.showToast({
         content: '请输入原密码',
         duration: 2000,
       });
       return
     }
-    if(validator.checkValEmpty(this.data.info.newPwd)){
+    if (validator.checkValEmpty(this.data.info.newPwd)) {
       my.showToast({
         content: '请输入新密码',
         duration: 2000,
       });
       return
     }
-    if(this.data.newTwo != this.data.info.newPwd){
+    if (!validator.checkPassword(this.data.info.newPwd)) {
+      my.showToast({
+        content: '新密码格式有误，应为8-16位字母数字组合',
+        duration: 2000,
+      });
+      return
+    }
+    if (this.data.newTwo != this.data.info.newPwd) {
       my.showToast({
         content: '两次新密码不一致，请确认',
         duration: 2000,
       });
       return
     }
-    $api.ajax(
-      '/sib/user/updatePwd',
-      'POST',
-      (res)=>{
+    let p = new Promise(function (re, rej) {
+      $api.ajax(
+        '/sib/user/updatePwd',
+        'POST',
+        (res) => {
+          my.showToast({
+            content:'修改成功',
+            duration:3000,
+            success:()=>{
+              re()
+            }
+          })
+        },
+        (err) => {
 
-      },
-      (err)=>{
+        },
+        true,
+        {
+          newPwd: md5.hex_md5(self.data.userInfo.mblNo + self.data.info.newPwd),
+          oldPwd: md5.hex_md5(self.data.userInfo.mblNo + self.data.info.oldPwd)
+        }
+      )
 
-      },
-      true,
-      {
-        newPwd: md5.hex_md5(this.data.userInfo.mblNo+this.data.info.newPwd),
-        oldPwd: md5.hex_md5(this.data.userInfo.mblNo+this.data.info.oldPwd) 
-      }
-    )
+    })
+    p.then(() => {
+      $api.ajax(
+        '/sib/xcx/login/logout',
+        'POST',
+        res => {
+          my.removeStorageSync({
+            key: 'sessionId',
+          });
+          my.navigateTo({
+            url: '/pages/index/index'
+          });
+        },
+        err => {
+
+        },
+        true
+      )
+    })
+
   }
 });

--
Gitblit v1.8.0