From 0f783bec98e092521c03bed051a3e252af6a6b7f Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 5 May 2020 09:57:23 +0800
Subject: [PATCH] 绑定手机的bug优化

---
 pages/user/Change_phone/Change_phone.js |  4 +++-
 pages/user/userinfo/userinfo.js         | 10 ++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pages/user/Change_phone/Change_phone.js b/pages/user/Change_phone/Change_phone.js
index 1abdc3a..7f9f5ce 100644
--- a/pages/user/Change_phone/Change_phone.js
+++ b/pages/user/Change_phone/Change_phone.js
@@ -39,7 +39,7 @@ Page({
       th.setData({
         mobile: getApp().globalData.userInfo.mobile,
         wxopenid: getApp().globalData.userInfo.weapp_openid,
-        time_len: sms_conf.time_out
+        time_len: sms_conf?sms_conf.time_out:60
       })
     })
 
@@ -61,6 +61,8 @@ Page({
         return false;
       }
     }else{
+      getApp().my_warnning("请输入11位的手机号码", 0, th);
+      return false;
       if (mobile.length < 11) {
         getApp().my_warnning("请输入11位的手机号码", 0, th);
       } else if (!myreg.test(mobile)) {
diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js
index 883a9e4..f13ab9a 100644
--- a/pages/user/userinfo/userinfo.js
+++ b/pages/user/userinfo/userinfo.js
@@ -659,11 +659,13 @@ Page({
       if (a.pickup_id != null) {
         req.get("/api/weshop/pickup/get/" + r.stoid + "/" + a.pickup_id, {
           success: function(da) {
+            if(da.data.data){
+              //设置门店
+              e.setData({
+                stoname: da.data.data.pickup_name
+              });
+            }
 
-            //设置门店
-            e.setData({
-              stoname: da.data.data.pickup_name
-            });
           }
         })
       }
--
libgit2 0.21.4