From 5b586660a7c29e0eb517ab26fcdddbc11e03bbc4 Mon Sep 17 00:00:00 2001 From: chenxuhui Date: Wed, 21 Nov 2018 13:37:24 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=99=BB=E5=BD=95=E9=A1=B5login?= =?UTF-8?q?=E5=AE=8C=E6=88=90=202=E3=80=81=E8=AF=B7=E6=B1=82=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 32 +------ app.json | 3 +- imgs/blueBtn.png | Bin 0 -> 8094 bytes pages/login/login.js | 196 +++++++++++++++++++++++++++++++++++++++++ pages/login/login.json | 5 ++ pages/login/login.wxml | 32 +++++++ pages/login/login.wxss | 72 +++++++++++++++ pages/logs/logs.js | 15 ---- pages/logs/logs.json | 3 - pages/logs/logs.wxml | 6 -- pages/logs/logs.wxss | 8 -- utils/net.js | 155 ++++++++++++++++---------------- 12 files changed, 386 insertions(+), 141 deletions(-) create mode 100644 imgs/blueBtn.png create mode 100644 pages/login/login.js create mode 100644 pages/login/login.json create mode 100644 pages/login/login.wxml create mode 100644 pages/login/login.wxss delete mode 100644 pages/logs/logs.js delete mode 100644 pages/logs/logs.json delete mode 100644 pages/logs/logs.wxml delete mode 100644 pages/logs/logs.wxss diff --git a/app.js b/app.js index aeefd6a..1659c3f 100644 --- a/app.js +++ b/app.js @@ -1,37 +1,9 @@ //app.js App({ onLaunch: function() { - // 展示本地存储能力 - var logs = wx.getStorageSync('logs') || [] - logs.unshift(Date.now()) - wx.setStorageSync('logs', logs) - // 登录 - wx.login({ - success: res => { - // 发送 res.code 到后台换取 openId, sessionKey, unionId - } - }) - // 获取用户信息 - wx.getSetting({ - success: res => { - if (res.authSetting['scope.userInfo']) { - // 已经授权，可以直接调用 getUserInfo 获取头像昵称，不会弹框 - wx.getUserInfo({ - success: res => { - // 可以将 res 发送给后台解码出 unionId - this.globalData.UserInfo = res.userInfo - - // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回 - // 所以此处加入 callback 以防止这种情况 - if (this.userInfoReadyCallback) { - this.userInfoReadyCallback(res) - } - } - }) - } - } - }) + }, + globalData: { PhoneNum: "", OpenId: "", diff --git a/app.json b/app.json index 4760eee..584d3dc 100644 --- a/app.json +++ b/app.json @@ -1,9 +1,9 @@ { "pages": [ + "pages/login/login", "pages/navigation/navigation", "pages/selectCustomer/selctCustomer", "pages/index/index", - "pages/logs/logs", "pages/main/main", "pages/my/my", "pages/saleForecastList/saleForecastList", @@ -19,6 +19,7 @@ "pages/guarantee/newbill/newbill", "pages/guarantee/selectbill/selectbill", "pages/guarantee/detailshow/detailshow" + ], "window": { "backgroundTextStyle": "light", diff --git a/imgs/blueBtn.png b/imgs/blueBtn.png new file mode 100644 index 0000000000000000000000000000000000000000..7c2da0ba5207fd086ffa84960322b8925ff5b861 GIT binary patch literal 8094 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 t?R literal 0 HcmV?d00001 diff --git a/pages/login/login.js b/pages/login/login.js new file mode 100644 index 0000000..f08bc99 --- /dev/null +++ b/pages/login/login.js @@ -0,0 +1,196 @@ +// pages/login/login.js + +var network = require("../../utils/net.js"); +var app = getApp(); +var openID; + +/** + * 获取绑定客户ID及用户电话 参数1、appID 2、openID + * 返回值globalCustomerID，WeixinUser_Phone + * 成功调用获取cookie方法及判断是否绑定成功方法 + */ +function GetBindCustomer(that) { + let method = '/MainSystem/B3WeChatMiniProgram/Rpcs/CommonRpc/GetBindCustomer'; + let params = [app.globalData.appID, app.globalData.openID]; + network.requestLoading(method, params, function (res) { + if (res.result != null) { + app.globalData.globalCustomerID = res.result.ID; + app.globalData.phoneNum = res.result.WeixinUser_Phone; + WeixinLogin(function (res) { + IsBinded(app.globalData.openID); + }); + } + }) +} +/** + * 判断是否绑定成功 参数openid + * 返回值phoneNum + * 成功调用是否关注公众号方法 + */ +function IsBinded(openid) { + let method = '/MainSystem/B3MiniProgramRpc/Rpcs/ManagerRpc/AccountRpc/IsBinded'; + let params = [openid]; + network.newRequestLoading(method, params, function (res) { + if (res.result != "") { + app.globalData.phoneNum = res.result; + IsBindWeixinMP(app.globalData.phoneNum) + } + }) +} +// 判断是否关注公众号 参数phone 返回值bool 成功进入首页 +function IsBindWeixinMP(phone) { + let method = '/MainSystem/B3WeChatMiniProgram/Rpcs/CommonRpc/IsBindWeixinMP'; + let params = [phone]; + network.requestLoading(method, params, function (res) { + // res.result = false; + if (res.result == true) { + wx.switchTab({ + url: '/pages/indexL/indexL', + }) + } else { + wx.showModal({ + title: '提示', + content: '请关注公众号', + showCancel: false, + }) + } + }) +} +// 获取cookie值 参数1、appID 2、openID +function WeixinLogin(successtion) { + let method = '/MainSystem/MainSystem/Auth/WeixinLogin'; + let params = [app.globalData.appID, app.globalData.openID]; + network.newRequestLoading(method, params, function (res) { + app.globalData.cookie = res.result; + successtion(); + }) +} +//绑定中转服务器客户对应信息 成功判断是否关注公众号 +function Bind(that) { + let userInfos = app.globalData.userInfo + let method2 = "/MainSystem/B3WeChatMiniProgram/Rpcs/CommonRpc/Bind"; + let params2 = [{ + "AppId": app.globalData.appID, + "OpenId": app.globalData.openID, + "Phone": that.data.phoneNum, + "NickName": userInfos.nickName, + "Sex": userInfos.gender, + "Province": userInfos.province, + "City": userInfos.city, + "Country": userInfos.country, + "HeadImgUrl": userInfos.avatarUrl, + "UnionId": "", + "CustomerId": app.globalData.globalCustomerID + }]; + network.requestLoading(method2, params2, function (res) { + if (res.result == true) { + IsBindWeixinMP(app.globalData.phoneNum) + } + }) +} + +Page({ + data: { + phoneNum: "", + index: 0, + customerArray: [{ + ID: 0, + Name: "请选择所属客户" + }], + }, + + // 客户列表变更选项信息 + listenerPickerSelected: function (e) { + this.setData({ + index: e.detail.value, + }); + app.globalData.globalCustomerID = this.data.customerArray[this.data.index].ID; + }, + + // 页面生命周期函数 + onShow: function () { + //由登录页面进入详情页变更值为0；分享直接进入为1 + app.globalData.shareInState = 0; + var that = this; + wx.login({ + success: function (res) { + let code = res.code; + let method = '/MainSystem/B3WeChatMiniProgram/Rpcs/CommonRpc/GetMiniOpenIdByCode'; + let params = [app.globalData.appID, code]; + network.requestLoading(method, params, function (res) { + app.globalData.openID = res.result; + GetBindCustomer(that) + }) + } + }); + let method = '/MainSystem/B3WeChatMiniProgram/Rpcs/CustomerRpc/GetList'; + let params = []; + network.requestLoading(method, params, function (res) { + if (res.result.length > 0) { + var lastArr = that.data.customerArray.concat(res.result) + that.setData({ + customerArray: lastArr, + }) + } + }) + + }, + + // 电话输入框 + getPhone: function (e) { + let val = e.detail.value; + this.data.phoneNum = val; + }, + + // 获取授权 成功 绑定信息到客户服务器 回调函数绑定中转服务器 + getUserInfo: function (e) { + var that = this; + if (e.detail.userInfo != null) { + app.globalData.userInfo = e.detail.userInfo + if (that.data.array[that.data.index].ID == 0) { + wx.showToast({ + title: '请选择所属客户', + }) + return false; + } + if (this.data.phoneNum == "") { + wx.showToast({ + title: '请输入手机号码', + }) + return false; + } else if (!(/^1[34578]\d{9}$/.test(this.data.phoneNum))) { + wx.showToast({ + title: '号码不正确', + }) + return false; + } + let userInfos = app.globalData.userInfo + let method = '/MainSystem/B3MiniProgramRpc/Rpcs/ManagerRpc/AccountRpc/QinBindByPhone'; + let params = [{ + "OpenId": app.globalData.openID, + "Phone": this.data.phoneNum, + "NickName": userInfos.nickName, + "Sex": userInfos.gender, + "Province": userInfos.province, + "City": userInfos.city, + "Country": userInfos.country, + "HeadImgUrl": userInfos.avatarUrl, + "UnionId": "" + }]; + network.newRequestLoading(method, params, function (res) { + if (res.result != null) { + app.globalData.phoneNum = that.data.phoneNum; + Bind(that) + } + }) + } else { + wx.showModal({ + title: '授权提示', + content: '请给予权限，不涉及个人隐私', + showCancel: false + }) + } + } + +}) + diff --git a/pages/login/login.json b/pages/login/login.json new file mode 100644 index 0000000..fc754d6 --- /dev/null +++ b/pages/login/login.json @@ -0,0 +1,5 @@ +{ + "navigationBarBackgroundColor": "white", + "navigationBarTextStyle": "black", + "navigationBarTitleText": "业务员登录" +} \ No newline at end of file diff --git a/pages/login/login.wxml b/pages/login/login.wxml new file mode 100644 index 0000000..e6c1e2d --- /dev/null +++ b/pages/login/login.wxml @@ -0,0 +1,32 @@ + + + + + 绑定客户 + + + {{customerArray[index].Name}} + + + + + + + 手机号码 + + + + + + + + + + + + 确认绑定 + + + + + \ No newline at end of file diff --git a/pages/login/login.wxss b/pages/login/login.wxss new file mode 100644 index 0000000..f16f7dd --- /dev/null +++ b/pages/login/login.wxss @@ -0,0 +1,72 @@ +/* pages/login/login.wxss */ +.containerView{ + margin-left: 30rpx; + margin-right: 30rpx; + height: 240rpx; + margin-top: 40%; + display: flex; + flex-direction: column; + +} + +.customerChooseView{ + height: 120rpx; + width: 100%; + display: flex; + flex-direction: row; + font-size: 20px; + color: black; +} + +.keyView{ + padding-top: 60rpx; + width: 40%; + height: 100%; +} + +.valueView{ + padding-top: 60rpx; + width: 60%; + height: 100%; +} + +.pickerPlaceHolder{ + color:rgb(202, 202, 202); +} + +.pickerSelected{ + color: black; +} + +.lineView { + height: 1rpx; + background-color: #dbdbdb; +} + +.imageView { + height: 80px; + width: 100%; + margin-top: 30px; + position: relative; + align-items: center; + justify-content: center; + box-sizing: content-box; +} + +.currentImage { + width: 100%; + height: 100%; +} + +.btnTextView { + position: absolute; + width: 100%; + top:0; + line-height: 65px; + text-align: center; +} + +.btnText { + color: white; + font-size: 34rpx; +} \ No newline at end of file diff --git a/pages/logs/logs.js b/pages/logs/logs.js deleted file mode 100644 index b2b967d..0000000 --- a/pages/logs/logs.js +++ /dev/null @@ -1,15 +0,0 @@ -//logs.js -const util = require('../../utils/util.js') - -Page({ - data: { - logs: [] - }, - onLoad: function () { - this.setData({ - logs: (wx.getStorageSync('logs') || []).map(log => { - return util.formatTime(new Date(log)) - }) - }) - } -}) diff --git a/pages/logs/logs.json b/pages/logs/logs.json deleted file mode 100644 index 28379bc..0000000 --- a/pages/logs/logs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "navigationBarTitleText": "查看启动日志" -} \ No newline at end of file diff --git a/pages/logs/logs.wxml b/pages/logs/logs.wxml deleted file mode 100644 index b5a85ac..0000000 --- a/pages/logs/logs.wxml +++ /dev/null @@ -1,6 +0,0 @@ - - - - {{index + 1}}. {{log}} - - diff --git a/pages/logs/logs.wxss b/pages/logs/logs.wxss deleted file mode 100644 index 94d4b88..0000000 --- a/pages/logs/logs.wxss +++ /dev/null @@ -1,8 +0,0 @@ -.log-list { - display: flex; - flex-direction: column; - padding: 40rpx; -} -.log-item { - margin: 10rpx; -} diff --git a/utils/net.js b/utils/net.js index 1da5e63..1abacff 100644 --- a/utils/net.js +++ b/utils/net.js @@ -1,57 +1,70 @@ -//不显示对话框的请求 -const app = getApp() - -function request(url, params, success, fail) { - this.requestLoading(url, params, "", success, fail) -} +var app = getApp(); +var reconnectMethod = ''; +var reconnectParams = []; +var newReconnectMethod = ''; +var newReconnectParams = []; -// 展示进度条的网络请求 -// url:网络请求的url -// params:请求参数 -// message:进度条的提示信息 -// success:成功的回调函数 -// fail：失败的回调 -function requestLoading(method, params, successaction, erroraction) { - +/** + * method:接口str + * params:参数[] + * successaction:成功回调 + */ +function requestLoading(method, params, successaction) { + reconnectMethod = method; + reconnectParams = params; wx.showLoading({ title: "加载中", }) + var data = { 'id': 1, 'method': method, 'params': params }; - var baseUrl = app.globalData.BaseUrl - console.log(baseUrl) - console.log(data) wx.request({ - url: baseUrl, + url: app.globalData.BaseUrl, data: data, header: { 'content-type': 'application/json', - 'cookie': app.globalData.Cookie + 'cookie': app.globalData.cookie }, method: 'POST', - success: function(res) { + success: function (res) { // console.log(res) if (res.data.error != null) { - if (erroraction != null) { - erroraction(res.data.error) + if (res.data.error.code == 401) { + wx.request({ + url: app.globalData.BaseUrl, + data: { + 'id': 1, + 'method': "/MainSystem/MainSystem/Auth/WeixinLogin", + 'params': [app.globalData.appID, app.globalData.openID] + }, + header: { + 'content-type': 'application/json', + 'cookie': app.globalData.cookie + }, + method: 'POST', + success: function (res) { + app.globalData.cookie = res.data.result; + requestLoading(reconnectMethod, reconnectParams, successaction); + } + }) } else { wx.showModal({ showCancel: false, - title: '执行出错:', + title: '执行出错', content: res.data.error.message, }) - } + } } else { successaction(res.data) } }, - fail: function(res) { + fail: function (res) { console.log(res) wx.showModal({ title: '执行出错', @@ -59,41 +72,58 @@ function requestLoading(method, params, successaction, erroraction) { }) }, - complete: function(res) { + complete: function (res) { wx.hideLoading() }, }) } function transfer_request(method, params, successaction) { - + newReconnectMethod = method; + newReconnectParams = params; wx.showLoading({ title: "加载中", }) - var data = { - 'DecryptCookie': app.globalData.DecryptCookie, - 'AppendUrlString': '', - 'Method': method, - 'CustomerId': app.globalData.CustomerId, - 'Data': params + + var newData = { + "DecryptCookie": app.globalData.cookie, + "CustomerId": app.globalData.globalCustomerID, + "Method": method, + "Data": params }; - var baseUrl = app.globalData.TransferUrl - console.log(baseUrl) - console.log(data) + var baseUrl = app.globalData.TranferBaseUrl; wx.request({ url: baseUrl, - data: data, + data: newData, header: { - 'content-type': 'application/json' + 'content-type': 'application/json', + 'cookie': app.globalData.cookie }, method: 'POST', - success: function(res) { - // console.log(res) + success: function (res) { + // console.log(res) if (res.data.error != null) { - if (res.data.error.code == '401' && res.data.error.message == "Unauthorized") { - console.log('重连系统-------------'); - transfer_login() + if (res.data.error.code == 401) { + wx.request({ + url: app.globalData.TransferUrl, + data: { + "DecryptCookie": app.globalData.cookie, + "CustomerId": app.globalData.globalCustomerID, + "Method": "/MainSystem/MainSystem/Auth/WeixinLogin", + "Data": [app.globalData.appID, app.globalData.openID] + }, + header: { + 'content-type': 'application/json', + 'cookie': app.globalData.cookie + }, + method: 'POST', + success: function (res) { + app.globalData.cookie = res.data.result; + transfer_request(newReconnectMethod, newReconnectParams, successaction); + + } + }) } else { wx.showModal({ showCancel: false, @@ -104,52 +134,21 @@ function transfer_request(method, params, successaction) { } else { successaction(res.data) } - }, - fail: function(res) { + fail: function (res) { console.log(res) wx.showModal({ title: '执行出错', content: res, - }) - + }); }, - complete: function(res) { + complete: function (res) { wx.hideLoading() }, }) } -function transfer_login() { - - wx.request({ - url: app.globalData.TransferUrl, - data: { - 'CustomerId': 1, - 'Method': app.globalData.LoginPath, - 'Data': [app.globalData.AppId, app.globalData.OpenId] - }, - header: { - 'content-type': 'application/json' - }, - method: 'POST', - success: function(res) { - app.globalData.DecryptCookie = res.data.result; - console.log(app.globalData.DecryptCookie) - wx.showModal({ - showCancel: false, - title: '提示', - content: '由于长时间未操作，需要重新连接！', - }) - wx.switchTab({ - url: '/pages/main/main', - }) - } - }) -} - module.exports = { - request: request, requestLoading: requestLoading, transfer_request: transfer_request -} \ No newline at end of file +}