From cf3c25d8d49570b121718cf5f46b684ef3e12164 Mon Sep 17 00:00:00 2001
From: yvan <yvan.ni@yolipai.com>
Date: Tue, 18 Feb 2020 09:32:59 +0800
Subject: [PATCH] 小程序更改新手机，去掉旧手机验证码

---
 pages/user/Change_phone/Change_phone.js | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/pages/user/Change_phone/Change_phone.js b/pages/user/Change_phone/Change_phone.js
index 33a7e7f..1abdc3a 100644
--- a/pages/user/Change_phone/Change_phone.js
+++ b/pages/user/Change_phone/Change_phone.js
@@ -11,7 +11,7 @@ Page({
    */
   data: {
     iurl: r.imghost,
-    inputxphone: 0,
+    inputxphone: 1,
     mobile: null, //旧手机号码
     currentTime: "", //验证码发送倒计时
     getvcode: "获取验证码", //显示文字
@@ -53,12 +53,22 @@ Page({
     var isver = th.data.isver;
     var send = th.data.send;
     var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/;
-    if (mobile.length < 11) {
-      getApp().my_warnning("请输入11位的手机号码", 0, th);
-    } else if (!myreg.test(mobile)) {
-      getApp().my_warnning("手机号有误", 0, th);
-      return false;
+    if(change_phone){
+      if (change_phone.length < 11) {
+        getApp().my_warnning("请输入11位的手机号码", 0, th);
+      } else if (!myreg.test(change_phone)) {
+        getApp().my_warnning("手机号有误", 0, th);
+        return false;
+      }
+    }else{
+      if (mobile.length < 11) {
+        getApp().my_warnning("请输入11位的手机号码", 0, th);
+      } else if (!myreg.test(mobile)) {
+        getApp().my_warnning("手机号有误", 0, th);
+        return false;
+      }
     }
+
     if (change_phone == mobile) {
       getApp().my_warnning("新手机号码和旧手机号码不能一样", 0, th);
       return false;
@@ -122,6 +132,12 @@ Page({
     if (change_phone.length > 1) {
       mobile = change_phone
     }
+    if(!change_phone){
+      return  getApp().my_warnning("请输入手机号", 0, th);
+    }
+    if(!code){
+      return  getApp().my_warnning("请输入验证码", 0, th);
+    }
     getApp().request.put("/api/weshop/users/updateMobile/" + r.stoid + '/' + o.user_id + '/' + code + '/' + mobile, {
       success: function(res) {
         if (res.data.code == 0) {
@@ -230,4 +246,4 @@ Page({
   onShareAppMessage: function() {
 
   }
-})
\ No newline at end of file
+})
--
libgit2 0.21.4