Merge branch 'dev' into xcx-rebuild

liangjin

2021-03-17 85fc392860c128c204fc2a2c3731bcc352914d99

 pages/forgetPassword/forgetPassword.js

@@ -21,7 +21,7 @@
      return 
    }
    $api.ajax(
      '/sib/user/sendMsg',
      '/zic/user/sendMsg',
      'POST',
      (res)=>{
        
@@ -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
@@ -102,7 +109,7 @@
      return
    }
    $api.ajax(
      '/sib/user/forgetPwd',
      '/zic/user/forgetPwd',
      'POST',
      res=>{
        my.showToast({