From fc6e6ec9d36eedb2f5f03b165738df6bb92a357d Mon Sep 17 00:00:00 2001
From: iceling <iceling@meidd.com>
Date: Wed, 13 Nov 2019 14:09:43 +0800
Subject: [PATCH] 1111

---
 pages/user/Change_phone/Change_phone.js | 34 ++++++++++++++++++++++------------
 pages/user/userinfo/userinfo.wxml       |  4 ++--
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/pages/user/Change_phone/Change_phone.js b/pages/user/Change_phone/Change_phone.js
index 8ef24fb..33a7e7f 100644
--- a/pages/user/Change_phone/Change_phone.js
+++ b/pages/user/Change_phone/Change_phone.js
@@ -11,29 +11,38 @@ Page({
    */
   data: {
     iurl: r.imghost,
-    inputxphone: 1,
+    inputxphone: 0,
     mobile: null, //旧手机号码
     currentTime: "", //验证码发送倒计时
-    getvcode: "获取验证码",
+    getvcode: "获取验证码", //显示文字
+    time_len: 0, //重新获取时长
     wxopenid: null,
     isver: 0, //是否有发送验证码
     code: "", //验证码
     change_phone: "", //新手机号码
+    send: 1, //发送类型
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+    var th = this;
     var pages = getCurrentPages();
-    var prevPage = pages[pages.length - 2];  //上一个页面
+    var prevPage = pages[pages.length - 2]; //上一个页面
     //直接调用上一个页面的setData()方法，把数据存到上一个页面中去
     prevPage.setData({
       is_zy: 1
     })
-    this.setData({
-      mobile: options.mobile,
-      wxopenid: options.openid
+    getApp().getConfig2(function(ee) {
+      var sms_conf = ee.sms_send_type;
+      sms_conf = JSON.parse(sms_conf);
+      th.setData({
+        mobile: getApp().globalData.userInfo.mobile,
+        wxopenid: getApp().globalData.userInfo.weapp_openid,
+        time_len: sms_conf.time_out
+      })
     })
+
   },
   //获取手机验证码
   Ver_phone: function() {
@@ -42,6 +51,7 @@ Page({
     var wxopenid = th.data.wxopenid;
     var change_phone = th.data.change_phone;
     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);
@@ -66,7 +76,7 @@ Page({
     getApp().request.post("/api/weshop/smslog/sendsms", {
       data: {
         store_id: r.stoid,
-        scene: 1, //发送类型(1短信 2语音)
+        scene: send, //发送类型(1短信 2语音)
         mobile: mobile,
         wxopenid: wxopenid
       },
@@ -74,14 +84,15 @@ Page({
         if (res.data.code == 0) {
           th.setData({
             isver: 0,
-            getvcode: 60,
+            getvcode: th.data.time_len,
             currentTime: setInterval(th.gettime, 1000),
+            send: 2
           })
         } else {
           getApp().my_warnning(res.data.msg, 0, th);
           th.setData({
             isver: 0,
-            getvcode: "重新获取"
+            getvcode: "重新获取",
           })
           return false;
         }
@@ -114,9 +125,8 @@ Page({
     getApp().request.put("/api/weshop/users/updateMobile/" + r.stoid + '/' + o.user_id + '/' + code + '/' + mobile, {
       success: function(res) {
         if (res.data.code == 0) {
-         
-           var url="/pages/user/userinfo/userinfo?change_phone" + change_phone
-          console.log("uuuuuuuu",url);
+          var url = "/pages/user/userinfo/userinfo?change_phone" + change_phone
+          getApp().globalData.userInfo.mobile = mobile;
           getApp().my_warnning("更换成功", 0, th);
           getApp().goto(url);
 
diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml
index a73ee41..c2c5633 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -201,11 +201,11 @@
   </view>
 </view>
 <!-- 确认修改按钮 -->
-<cover-view class="flex-center confirm">
+<view class="flex-center confirm">
   <view class="flex-center fs30 confirmtext"bindtap="confirm_revision">
     <view>确认修改</view>
   </view>
-</cover-view>
+</view>
 
 <!--弹出层内容，其中的“我知道”中绑定让弹出层消失的函数：bindtap="hide"-->
 <view class="tc_view" hidden='{{tc_hide}}' bindtap='hide_tc'>
--
libgit2 0.21.4