From 0a33e55449c6d7a47f4d21b7b2465b254984714b Mon Sep 17 00:00:00 2001 From: WXD-SEASON\season Date: Thu, 29 Jul 2021 17:27:21 +0800 Subject: [PATCH] 修改手机移到B包 --- packageB/pages/user/Change_phone/Change_phone.js | 251 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageB/pages/user/Change_phone/Change_phone.json | 6 ++++++ packageB/pages/user/Change_phone/Change_phone.wxml | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageB/pages/user/Change_phone/Change_phone.wxss | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/user/Change_phone/Change_phone.js | 251 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/user/Change_phone/Change_phone.json | 6 ------ pages/user/Change_phone/Change_phone.wxml | 57 --------------------------------------------------------- pages/user/Change_phone/Change_phone.wxss | 71 ----------------------------------------------------------------------- pages/user/userinfo/userinfo.wxml | 2 +- 9 files changed, 386 insertions(+), 386 deletions(-) create mode 100644 packageB/pages/user/Change_phone/Change_phone.js create mode 100644 packageB/pages/user/Change_phone/Change_phone.json create mode 100644 packageB/pages/user/Change_phone/Change_phone.wxml create mode 100644 packageB/pages/user/Change_phone/Change_phone.wxss delete mode 100644 pages/user/Change_phone/Change_phone.js delete mode 100644 pages/user/Change_phone/Change_phone.json delete mode 100644 pages/user/Change_phone/Change_phone.wxml delete mode 100644 pages/user/Change_phone/Change_phone.wxss diff --git a/packageB/pages/user/Change_phone/Change_phone.js b/packageB/pages/user/Change_phone/Change_phone.js new file mode 100644 index 0000000..303f7d0 --- /dev/null +++ b/packageB/pages/user/Change_phone/Change_phone.js @@ -0,0 +1,251 @@ +var a = getApp(), + o = a.globalData, + r = a.globalData.setting, + t = a.request, + s = require("../../../../utils/common.js"), + util = require("../../../../utils/util.js"); +Page({ + + /** + * 页面的初始数据 + */ + data: { + iurl: r.imghost, + inputxphone: 1, + mobile: null, //旧手机号码 + currentTime: "", //验证码发送倒计时 + 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]; //上一个页面 + //直接调用上一个页面的setData()方法，把数据存到上一个页面中去 + prevPage.setData({ + is_zy: 1 + }) + 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?sms_conf.time_out:60 + }) + }) + + }, + //获取手机验证码 + Ver_phone: function() { + var th = this; + var mobile = th.data.mobile; + var wxopenid = th.data.wxopenid; + var change_phone = th.data.change_phone; + var isver = th.data.isver; + var send = th.data.send; + var myreg = /^(((11[0-9]{1})|(12[0-9]{1})|(13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(16[0-9]{1})|(19[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/; + 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{ + getApp().my_warnning("请输入11位的手机号码", 0, th); + return false; + 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; + } + if (change_phone != "") { + mobile = change_phone; + } + if (isver == 0) { + th.setData({ + isver: 1 + }) + } else { + return false + } + getApp().request.post("/api/weshop/smslog/sendsms", { + data: { + store_id: r.stoid, + scene: send, //发送类型(1短信 2语音) + mobile: mobile, + wxopenid: wxopenid + }, + success: function(res) { + if (res.data.code == 0) { + th.setData({ + isver: 0, + 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: "重新获取", + }) + return false; + } + } + }) + + }, + gettime: function() { + var that = this; + if (that.data.getvcode == 1) { + //清除js定时器   + clearInterval(that.data.currentTime); + that.setData({ + getvcode: "重新获取", + }); + } else { + that.setData({ + getvcode: --that.data.getvcode, + }); + } + }, + change_phone: function() { + var th = this; + var code = th.data.code; + var mobile = th.data.mobile; + var change_phone = th.data.change_phone; + 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) { + var url = "/pages/user/userinfo/userinfo?change_phone" + change_phone + getApp().globalData.userInfo.mobile = mobile; + getApp().my_warnning("更换成功", 0, th); + getApp().goto(url); + + } else { + getApp().my_warnning(res.data.msg, 0, th); + return false; + } + + } + }) + + }, + //判断验证码是否正确 + ver_code: function(e) { + var th = this; + var code = th.data.code, + mobile = th.data.mobile, + wxopenid = th.data.wxopenid, + getvcode = th.data.getvcode, + chang_phone = th.data.change_phone; + if (code.length < 3 && code == "") { + getApp().my_warnning("请输入正确的验证码", 0, th); + return false; + } else if (getvcode.length < 3) { + getApp().my_warnning("验证超时", 0, th); + return false; + } else { + getApp().request.put("/api/weshop/users/updateMobileFirst/" + r.stoid + '/' + o.user_id + '/' + code, { + success: function(res) { + if (res.data.code == 0) { + th.setData({ + inputxphone: 1, + getvcode: "获取验证码", + code: "" + }) + clearInterval(th.data.currentTime); + } else { + getApp().my_warnning(res.data.msg, 0, th); + return false; + } + } + }) + } + }, + getCodeValue: function(e) { + this.setData({ + code: e.detail.value + }) + }, + getphoneValue: function(e) { + var th = this; + th.setData({ + change_phone: e.detail.value, + }) + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function() { + + } +}) diff --git a/packageB/pages/user/Change_phone/Change_phone.json b/packageB/pages/user/Change_phone/Change_phone.json new file mode 100644 index 0000000..8003812 --- /dev/null +++ b/packageB/pages/user/Change_phone/Change_phone.json @@ -0,0 +1,6 @@ +{ + "navigationBarTitleText": "更换手机", +"usingComponents": { + "warn": "/components/long_warn/long_warn" +} +} \ No newline at end of file diff --git a/packageB/pages/user/Change_phone/Change_phone.wxml b/packageB/pages/user/Change_phone/Change_phone.wxml new file mode 100644 index 0000000..465e2e6 --- /dev/null +++ b/packageB/pages/user/Change_phone/Change_phone.wxml @@ -0,0 +1,57 @@ + + + + + + + + + + {{mobile}} + + + + + + + + + + + + + {{getvcode}} + + + {{getvcode}}s + + + + + + + + 温馨提示: + 1.更换手机号后下次可使用新手机号登录。 + + 3.收到验证码而非本人操作时请及时更改密码。 + + + + + + + 下一步 + + + + + 确定更换 + + + + + + \ No newline at end of file diff --git a/packageB/pages/user/Change_phone/Change_phone.wxss b/packageB/pages/user/Change_phone/Change_phone.wxss new file mode 100644 index 0000000..1f435ff --- /dev/null +++ b/packageB/pages/user/Change_phone/Change_phone.wxss @@ -0,0 +1,71 @@ +page { + height: 100%; +} + +.container { + padding: 0rpx 55rpx; + border-top: 6rpx solid rgb(245, 245, 245); +} + +.phone_logo { + height: 400rpx; +} + +.phone_logo image { + width: 145rpx; + height: 230rpx; +} + +.phone,.code{ + border-bottom: 2rpx solid rgb(234, 234, 234); + height: 95rpx; +} + +.phone image { + width: 60rpx; + height: 60rpx; +} + +.phone .inphone { + margin-left: 50rpx; + color: rgb(153, 153, 153); +} + +.code image { + width: 70rpx; + height: 60rpx; +} + +.code input { + margin-left: 50rpx; + color: rgb(153, 153, 153); +} + +.code .Obtain { + width: 250rpx; + height: 60rpx; + border-left: 2rpx solid rgb(234, 234, 234); +} + +.phone, .code, .Tips { + padding-left: 30rpx; +} + +.Tips { + margin-top: 50rpx; + line-height: 50rpx; + color: rgb(153, 153, 153); +} + +.go { + width: 100%; + margin-top: 90rpx; +} + +.lower { + width: 430rpx; + height: 75rpx; + background-color: rgb(214, 1, 33); + border-radius: 40rpx; + color: rgb(255, 255, 255); +} diff --git a/pages/user/Change_phone/Change_phone.js b/pages/user/Change_phone/Change_phone.js deleted file mode 100644 index 9f3d054..0000000 --- a/pages/user/Change_phone/Change_phone.js +++ /dev/null @@ -1,251 +0,0 @@ -var a = getApp(), - o = a.globalData, - r = a.globalData.setting, - t = a.request, - s = require("../../../utils/common.js"), - util = require("../../../utils/util.js"); -Page({ - - /** - * 页面的初始数据 - */ - data: { - iurl: r.imghost, - inputxphone: 1, - mobile: null, //旧手机号码 - currentTime: "", //验证码发送倒计时 - 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]; //上一个页面 - //直接调用上一个页面的setData()方法，把数据存到上一个页面中去 - prevPage.setData({ - is_zy: 1 - }) - 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?sms_conf.time_out:60 - }) - }) - - }, - //获取手机验证码 - Ver_phone: function() { - var th = this; - var mobile = th.data.mobile; - var wxopenid = th.data.wxopenid; - var change_phone = th.data.change_phone; - var isver = th.data.isver; - var send = th.data.send; - var myreg = /^(((11[0-9]{1})|(12[0-9]{1})|(13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(16[0-9]{1})|(19[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/; - 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{ - getApp().my_warnning("请输入11位的手机号码", 0, th); - return false; - 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; - } - if (change_phone != "") { - mobile = change_phone; - } - if (isver == 0) { - th.setData({ - isver: 1 - }) - } else { - return false - } - getApp().request.post("/api/weshop/smslog/sendsms", { - data: { - store_id: r.stoid, - scene: send, //发送类型(1短信 2语音) - mobile: mobile, - wxopenid: wxopenid - }, - success: function(res) { - if (res.data.code == 0) { - th.setData({ - isver: 0, - 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: "重新获取", - }) - return false; - } - } - }) - - }, - gettime: function() { - var that = this; - if (that.data.getvcode == 1) { - //清除js定时器   - clearInterval(that.data.currentTime); - that.setData({ - getvcode: "重新获取", - }); - } else { - that.setData({ - getvcode: --that.data.getvcode, - }); - } - }, - change_phone: function() { - var th = this; - var code = th.data.code; - var mobile = th.data.mobile; - var change_phone = th.data.change_phone; - 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) { - var url = "/pages/user/userinfo/userinfo?change_phone" + change_phone - getApp().globalData.userInfo.mobile = mobile; - getApp().my_warnning("更换成功", 0, th); - getApp().goto(url); - - } else { - getApp().my_warnning(res.data.msg, 0, th); - return false; - } - - } - }) - - }, - //判断验证码是否正确 - ver_code: function(e) { - var th = this; - var code = th.data.code, - mobile = th.data.mobile, - wxopenid = th.data.wxopenid, - getvcode = th.data.getvcode, - chang_phone = th.data.change_phone; - if (code.length < 3 && code == "") { - getApp().my_warnning("请输入正确的验证码", 0, th); - return false; - } else if (getvcode.length < 3) { - getApp().my_warnning("验证超时", 0, th); - return false; - } else { - getApp().request.put("/api/weshop/users/updateMobileFirst/" + r.stoid + '/' + o.user_id + '/' + code, { - success: function(res) { - if (res.data.code == 0) { - th.setData({ - inputxphone: 1, - getvcode: "获取验证码", - code: "" - }) - clearInterval(th.data.currentTime); - } else { - getApp().my_warnning(res.data.msg, 0, th); - return false; - } - } - }) - } - }, - getCodeValue: function(e) { - this.setData({ - code: e.detail.value - }) - }, - getphoneValue: function(e) { - var th = this; - th.setData({ - change_phone: e.detail.value, - }) - }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide: function() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload: function() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh: function() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function() { - - } -}) diff --git a/pages/user/Change_phone/Change_phone.json b/pages/user/Change_phone/Change_phone.json deleted file mode 100644 index 8003812..0000000 --- a/pages/user/Change_phone/Change_phone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "navigationBarTitleText": "更换手机", -"usingComponents": { - "warn": "/components/long_warn/long_warn" -} -} \ No newline at end of file diff --git a/pages/user/Change_phone/Change_phone.wxml b/pages/user/Change_phone/Change_phone.wxml deleted file mode 100644 index 465e2e6..0000000 --- a/pages/user/Change_phone/Change_phone.wxml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - {{mobile}} - - - - - - - - - - - - - {{getvcode}} - - - {{getvcode}}s - - - - - - - - 温馨提示: - 1.更换手机号后下次可使用新手机号登录。 - - 3.收到验证码而非本人操作时请及时更改密码。 - - - - - - - 下一步 - - - - - 确定更换 - - - - - - \ No newline at end of file diff --git a/pages/user/Change_phone/Change_phone.wxss b/pages/user/Change_phone/Change_phone.wxss deleted file mode 100644 index 1f435ff..0000000 --- a/pages/user/Change_phone/Change_phone.wxss +++ /dev/null @@ -1,71 +0,0 @@ -page { - height: 100%; -} - -.container { - padding: 0rpx 55rpx; - border-top: 6rpx solid rgb(245, 245, 245); -} - -.phone_logo { - height: 400rpx; -} - -.phone_logo image { - width: 145rpx; - height: 230rpx; -} - -.phone,.code{ - border-bottom: 2rpx solid rgb(234, 234, 234); - height: 95rpx; -} - -.phone image { - width: 60rpx; - height: 60rpx; -} - -.phone .inphone { - margin-left: 50rpx; - color: rgb(153, 153, 153); -} - -.code image { - width: 70rpx; - height: 60rpx; -} - -.code input { - margin-left: 50rpx; - color: rgb(153, 153, 153); -} - -.code .Obtain { - width: 250rpx; - height: 60rpx; - border-left: 2rpx solid rgb(234, 234, 234); -} - -.phone, .code, .Tips { - padding-left: 30rpx; -} - -.Tips { - margin-top: 50rpx; - line-height: 50rpx; - color: rgb(153, 153, 153); -} - -.go { - width: 100%; - margin-top: 90rpx; -} - -.lower { - width: 430rpx; - height: 75rpx; - background-color: rgb(214, 1, 33); - border-radius: 40rpx; - color: rgb(255, 255, 255); -} diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml index 9b2188d..6e0aabd 100644 --- a/pages/user/userinfo/userinfo.wxml +++ b/pages/user/userinfo/userinfo.wxml @@ -166,7 +166,7 @@ --> - + 更换手机 {{phone}} -- libgit2 0.21.4