From 347b4614262cc14b654e9183c922bd4f515af469 Mon Sep 17 00:00:00 2001 From: chenxuhui Date: Wed, 5 Dec 2018 20:31:47 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=8F=8A=E7=99=BB=E5=BD=95=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 35 +- imgs/bindImage.png | Bin 0 -> 15409 bytes .../debitNoteDetail/debitNoteDetail.js | 4 +- pages/debitNoteList/debitNoteList.js | 4 +- pages/homePage/homePage.js | 36 +- pages/login/login.js | 329 ++++++++---------- pages/login/login.json | 6 +- pages/login/login.wxml | 30 +- pages/login/login.wxss | 113 +++--- pages/orderDetails/orderDetails.js | 2 +- pages/orderInquiry/orderInquiry.js | 6 +- .../outStoreDetail/outStoreDetail.js | 2 +- pages/saleOutStore/saleOutStore.js | 4 +- pages/sendCargo/sendCargo.js | 2 +- pages/sendCargo/sendCargo.wxml | 1 + pages/sendCargo/sendCargo.wxss | 4 +- pages/sendTheDetails/sendTheDetails.js | 8 +- .../statementOfAccount/statementOfAccount.js | 2 +- utils/net.js | 132 ++++--- 19 files changed, 394 insertions(+), 326 deletions(-) create mode 100644 imgs/bindImage.png diff --git a/app.js b/app.js index 1999865..6e2352a 100644 --- a/app.js +++ b/app.js @@ -1,20 +1,31 @@ App({ onLaunch: function () { + var that = this; + wx.getSystemInfo({ + success: function (res) { + that.globalData.winHeight = res.windowHeight; + } + }); }, globalData: { + winHeight:0, + cookie: "", + decryptCookie: '', + userInfo: null, + baseUrl: "https://miniprogram.food988.com/Rest.aspx", + tranferBaseUrl: 'https://miniprogram.food988.com/RequestTransfer.aspx', + globalCustomerID: 0, + phoneNum: "", + openID: "", + appID: "wx0b897783b2588147", - Phone: "", - OpenId: "", - AppName: "WeChat", - AppId: "wx0b897783b2588147", - // 自己的服务器 - BaseUrl: "https://miniprogram.food988.com/Rest.aspx", - // 转发到客户服务器 - TranferBaseUrl:"https://miniprogram.food988.com/RequestTransfer.aspx", - CustomerId:"", - // 原测试路径 - // BaseUrl: "https://weixintest.food988.com/Rest.aspx" - + // Phone: "", + // OpenId: "", + // AppName: "WeChat", + // AppId: "wx0b897783b2588147", + // BaseUrl: "https://miniprogram.food988.com/Rest.aspx", + // TranferBaseUrl:"https://miniprogram.food988.com/RequestTransfer.aspx", + // CustomerId:"", }, }) \ No newline at end of file diff --git a/imgs/bindImage.png b/imgs/bindImage.png new file mode 100644 index 0000000000000000000000000000000000000000..ae5447aefd8900ebe667ce8b59f8c38037c7bdca GIT binary patch literal 15409 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 0) { - var lastArr = that.data.array.concat(res.result) + var lastArr = that.data.customerArray.concat(res.result) that.setData({ - array: lastArr, + customerArray: lastArr, }) } }) + + }, + + // 电话输入框 + getPhone: function (e) { + let val = e.detail.value; + this.data.phoneNum = val; }, - // 用户绑定按钮操作 - getUserInfo: function(e) { + // 获取授权 成功 绑定信息到客户服务器 回调函数绑定中转服务器 + getUserInfo: function (e) { var that = this; if (e.detail.userInfo != null) { - app.globalData.userInfo = e.detail.userInfo; - nickName = app.globalData.userInfo.nickName; - gender = app.globalData.userInfo.gender; - province = app.globalData.userInfo.province; - city = app.globalData.userInfo.city; - country = app.globalData.userInfo.country; - avatarUrl = app.globalData.userInfo.avatarUrl; - //判断用户是否获取绑定信息 - if (that.data.showCustomerChoise) { - if (that.data.array[that.data.index].ID == 0) { - wx.showToast({ - image: '/imgs/avatar.png', - title: '请选择所属客户', - }) - return false; - } + app.globalData.userInfo = e.detail.userInfo + if (that.data.customerArray[that.data.index].ID == 0) { + wx.showToast({ + title: '请选择所属客户', + }) + return false; } - if (app.globalData.Phone == "") { + if (this.data.phoneNum == "") { wx.showToast({ - image: '/imgs/avatar.png', - title: '手机号码不能为空', + title: '请输入手机号码', }) return false; - } else if (!(/^1[34578]\d{9}$/.test(app.globalData.Phone))) { + } else if (!(/^1[34578]\d{9}$/.test(this.data.phoneNum))) { wx.showToast({ - image: '/imgs/avatar.png', title: '号码不正确', }) return false; } + let userInfos = app.globalData.userInfo + let method = bindByPhone; + 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.transfer_request(method, params, function (res) { + if (res.result != null) { + app.globalData.phoneNum = that.data.phoneNum; + // 判断是否绑定成功 + Bind(that) + } + }) } else { wx.showModal({ title: '授权提示', @@ -146,104 +206,5 @@ Page({ showCancel: false }) } - var method = '/MainSystem/B3WeChatMiniProgram/Rpcs/CommonRpc/Bind'; - var params = [{ - OpenId: openid, - Phone: app.globalData.Phone, - NickName: app.globalData.userInfo.nickName, - Sex: app.globalData.userInfo.gender, - Province: app.globalData.userInfo.province, - City: app.globalData.userInfo.city, - Country: app.globalData.userInfo.country, - HeadImgUrl: app.globalData.userInfo.avatarUrl, - UnionId: "", - //请求新增参数 - AppId: app.globalData.AppId, - CustomerId: that.data.array[that.data.index].ID, - }]; - var storageCustomerID = that.data.array[that.data.index].ID; - app.globalData.CustomerId = storageCustomerID; - - // 先绑定客户服务器 - that.bindCustomerPreviousURL(function(res) { - // 再绑定中转服务器 - network.previousRequestLoading(method, params, function(res) { - // 再判断是否关联公众号 - IsBindWeixinMP(app.globalData.Phone); - - }); - }) - }, - - // 进入公众号绑定页面 - bindPublicNumber: function(event){ - wx.navigateTo({ - url: '/pages/first/first?code=' + code, - }) - }, - - // 绑定客户服务器 - bindCustomerPreviousURL: function(successaction) { - var method = '/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/AccountRpc/XuBindByPhone'; - var previousParams = [{ - OpenId: openid, - Phone: app.globalData.Phone, - NickName: app.globalData.userInfo.nickName, - Sex: app.globalData.userInfo.gender, - Province: app.globalData.userInfo.province, - City: app.globalData.userInfo.city, - Country: app.globalData.userInfo.country, - HeadImgUrl: app.globalData.userInfo.avatarUrl, - UnionId: "", - }]; - network.requestLoading(method, previousParams, function(res) { - successaction(res.result); - }) - }, - - // 页面初始化 静默登录相关判断 - onShow: function() { - var that = this; - this.choiceCustomer(function (res){ - getOpenId(function (res) { - openid = res; - IsBind(openid, function (res) { - app.globalData.Phone = res; - if (res == "") { - - } else { - //跳转到指定页面 - IsBindWeixinMP(app.globalData.Phone) - } - }) - }) - }); - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage: function() { - var that = this - if (res.from === 'button') { - // 来自页面内转发按钮 - console.log(res.target) - } - return { - title: '分享页面的标题', - path: "/pages/login/login", - //分享成功后执行 - success: function(res) { - console.log("--------------转发成功--------------------") - }, - - fail: function(res) { - console.log("--------------转发失败--------------------") - } - } - } - - - }) \ No newline at end of file diff --git a/pages/login/login.json b/pages/login/login.json index 58857d8..7806624 100644 --- a/pages/login/login.json +++ b/pages/login/login.json @@ -1 +1,5 @@ -{"navigationBarTitleText": "禽客户易"} \ No newline at end of file +{ + "navigationBarBackgroundColor": "white", + "navigationBarTextStyle": "black", + "navigationBarTitleText": "禽客户易" + } \ No newline at end of file diff --git a/pages/login/login.wxml b/pages/login/login.wxml index 9f096c4..0a17aa7 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -1,16 +1,26 @@ - - + + - - - {{array[index].Name}} - - + + 绑定客户 + + + {{customerArray[index].Name}} + + + + + + + 手机号码 + + + + + - - - + \ No newline at end of file diff --git a/pages/login/login.wxss b/pages/login/login.wxss index b5950ef..54cf4bd 100644 --- a/pages/login/login.wxss +++ b/pages/login/login.wxss @@ -1,60 +1,87 @@ -page { - background: #fff; +/* pages/login/login.wxss */ +.containerView{ + margin-left: 30rpx; + margin-right: 30rpx; + height: 240rpx; + margin-top: 40%; + display: flex; + flex-direction: column; + } -.img1 { - margin-left: 35%; - height: 150px; - width: 150px; - margin-top: 20%; +.customerChooseView{ + height: 120rpx; + width: 100%; + display: flex; + flex-direction: row; + font-size: 20px; + color: black; } -.pickerPlaceHolder { - text-align: center; - height: 40px; - background: #EAF1F8; - line-height: 40px; - color: #999; +.keyView{ + padding-top: 60rpx; + width: 40%; + height: 100%; } -.pickerSelected { - text-align: center; - height: 40px; - line-height: 40px; - background: #EAF1F8; +.valueView{ + padding-top: 60rpx; + width: 60%; + height: 100%; +} + +.pickerPlaceHolder{ + color:rgb(202, 202, 202); +} + +.pickerSelected{ color: black; } -.view2 { - border-top: 1px solid #fafafa; - border-right: 1px solid #fafafa; - border-left: 1px solid #fafafa; - border-bottom: 1px solid #fafafa; - width: 90%; - height: 40px; - margin-left: 5%; - margin-right: 5%; - border-radius: 0.2em; - margin-top: 5%; +.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; } -.input { +/* .currentImage { + width: 100%; + height: 100%; +} */ + +.btnTextView { + position: absolute; + width: 100%; + top:0; + line-height: 65px; text-align: center; - height: 40px; - background: #EAF1F8; } -.denglu { - margin-left: 5%; - margin-top: 10%; - width: 90%; - margin-right: 5%; - background: #f98b29; - color: #fff; +.btnText { + color: white; + font-size: 34rpx; } -.wxmp { - position: fixed; - bottom: 0rpx; - width: 100%; +.btn_btn { + font-size: 40rpx; + color: white; + margin-top: 10%; + padding: 0, auto; + display: block; + border: none; + background: transparent; } +.currentImage { + width: 100%; + height: 80px; + +} \ No newline at end of file diff --git a/pages/orderDetails/orderDetails.js b/pages/orderDetails/orderDetails.js index 500fd81..c802a47 100644 --- a/pages/orderDetails/orderDetails.js +++ b/pages/orderDetails/orderDetails.js @@ -22,7 +22,7 @@ Page({ var method = '/MainSystem/B3MiniProgramRpc/Rpcs/CustomerRpc/OrderRpc/GetOrderDetail'; var params = [ID]; - network.requestLoading(method, params, function (res) { + network.transfer_request(method, params, function (res) { that.setData({ list: res.result, }) diff --git a/pages/orderInquiry/orderInquiry.js b/pages/orderInquiry/orderInquiry.js index c2dd875..ff84a07 100644 --- a/pages/orderInquiry/orderInquiry.js +++ b/pages/orderInquiry/orderInquiry.js @@ -50,7 +50,7 @@ Page({ var method = '/MainSystem/B3MiniProgramRpc/Rpcs/CustomerRpc/OrderRpc/GetOrder'; var params = [0, pageindex, pagesize]; - network.requestLoading(method, params, function(res) { + network.transfer_request(method, params, function(res) { for (var i = 0; i < res.result.length; i++) { let dmo = { LoadTime: timechage.formatTimeTwo(res.result[i].LoadTime.substring(6, 19), "Y/M/D h:m"), @@ -68,7 +68,7 @@ Page({ var reslut1=[]; var method = '/MainSystem/B3MiniProgramRpc/Rpcs/CustomerRpc/OrderRpc/GetOrder'; var params = [20, pageindex, pagesize]; - network.requestLoading(method, params, function (res) { + network.transfer_request(method, params, function (res) { for (var i = 0; i < res.result.length; i++) { let dmo = { LoadTime: timechage.formatTimeTwo(res.result[i].LoadTime.substring(6, 19), "Y/M/D h:m"), @@ -127,7 +127,7 @@ Page({ var method = '/MainSystem/B3MiniProgramRpc/Rpcs/CustomerRpc/OrderRpc/GetOrder'; var params = [0, pageindex, pagesize]; - network.requestLoading(method, params, function (res) { + network.transfer_request(method, params, function (res) { for (var i = 0; i < res.result.length; i++) { let dmo = { LoadTime: timechage.formatTimeTwo(res.result[i].LoadTime.substring(6, 19), "Y/M/D h:m"), diff --git a/pages/saleOutStore/outStoreDetail/outStoreDetail.js b/pages/saleOutStore/outStoreDetail/outStoreDetail.js index ca823c9..25e5a77 100644 --- a/pages/saleOutStore/outStoreDetail/outStoreDetail.js +++ b/pages/saleOutStore/outStoreDetail/outStoreDetail.js @@ -18,7 +18,7 @@ Page({ let totalMoney = 0; let method = '/MainSystem/B3MiniProgramRpc/Rpcs/CustomerRpc/SaleOutStoreRpc/GetSaleOutStoreDetail'; let params = [detailItemID]; - network.requestLoading(method, params, function (res) { + network.transfer_request(method, params, function (res) { var array = res.result; for (var i = 0; i < array.length; i++) { if (array[i].Money) { diff --git a/pages/saleOutStore/saleOutStore.js b/pages/saleOutStore/saleOutStore.js index e774608..dd89a12 100644 --- a/pages/saleOutStore/saleOutStore.js +++ b/pages/saleOutStore/saleOutStore.js @@ -12,7 +12,7 @@ function getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize) { let getArr = []; let method = outStoreMethod; let params = [0, UnCheckPageIndex, UnCheckPageSize]; - network.requestLoading(method, params, function(res) { + network.transfer_request(method, params, function(res) { var array = res.result; if (array.length <= 0) { wx.showToast({ @@ -48,7 +48,7 @@ function getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize) { let getArr = []; let method = outStoreMethod; let params = [20, CheckedPageIndex, CheckedPageSize]; - network.requestLoading(method, params, function(res) { + network.transfer_request(method, params, function(res) { var array = res.result; if (array.length <= 0) { wx.showToast({ diff --git a/pages/sendCargo/sendCargo.js b/pages/sendCargo/sendCargo.js index 363b42d..2328408 100644 --- a/pages/sendCargo/sendCargo.js +++ b/pages/sendCargo/sendCargo.js @@ -22,7 +22,7 @@ Page({ var reslut = []; var method = '/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/OrderRpc/GetNoDriverOrder'; var params = []; - network.requestLoading(method, params, function (res) { + network.transfer_request(method, params, function (res) { for (var i = 0; i < res.result.length; i++) { let dmo = { LoadTime: timechage.formatTimeTwo(res.result[i].LoadTime.substring(6, 19), "Y/M/D h:m"), diff --git a/pages/sendCargo/sendCargo.wxml b/pages/sendCargo/sendCargo.wxml index 9c176da..ac12f51 100644 --- a/pages/sendCargo/sendCargo.wxml +++ b/pages/sendCargo/sendCargo.wxml @@ -18,6 +18,7 @@ Customer_Name}} ¥{{item.Money}} + NO.{{item. diff --git a/pages/sendCargo/sendCargo.wxss b/pages/sendCargo/sendCargo.wxss index 5d74076..b732418 100644 --- a/pages/sendCargo/sendCargo.wxss +++ b/pages/sendCargo/sendCargo.wxss @@ -44,11 +44,11 @@ page { } .goodsNum{ height: 100%; - width: 50%; + width: 30%; } .goodsMoney{ height: 100%; - width: 50%; + width: 70%; text-align: right; } diff --git a/pages/sendTheDetails/sendTheDetails.js b/pages/sendTheDetails/sendTheDetails.js index 5a6d389..c8abecd 100644 --- a/pages/sendTheDetails/sendTheDetails.js +++ b/pages/sendTheDetails/sendTheDetails.js @@ -28,7 +28,7 @@ Page({ "PageSize": 100 }]; - network.requestLoading(method2, params2, function(res) { + network.transfer_request(method2, params2, function(res) { that.setData({ name1: res.result, }) @@ -53,7 +53,7 @@ Page({ var method1 = '/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/OrderRpc/LoadForDriver'; var params1 = [ID]; - network.requestLoading(method1, params1, function(res) { + network.transfer_request(method1, params1, function(res) { that.setData({ ID1: res.result.ID, LoadTime1: timechage.formatTimeTwo(res.result.LoadTime.substring(6, 19), "Y/M/D"), @@ -74,7 +74,7 @@ Page({ "PageSize": 100 }]; - network.requestLoading(method2, params2, function(res) { + network.transfer_request(method2, params2, function(res) { //res就是我们请求接口返回的数据 that.setData({ name1: res.result, @@ -134,7 +134,7 @@ Page({ } else { var method = '/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/OrderRpc/SetDriverToOrder'; var params = [ID, ID4]; - network.requestLoading(method, params, function(res) { + network.transfer_request(method, params, function(res) { if (ID4 != null) { wx.navigateBack({ delta: "/pages/theDriverSend/theDriverSend" diff --git a/pages/statementOfAccount/statementOfAccount.js b/pages/statementOfAccount/statementOfAccount.js index 5f8090e..ba81413 100644 --- a/pages/statementOfAccount/statementOfAccount.js +++ b/pages/statementOfAccount/statementOfAccount.js @@ -44,7 +44,7 @@ Page({ getBalanceList: function(params, clear) { let that = this; - network.requestLoading(method, params, function(res) { + network.transfer_request(method, params, function(res) { var array = JSON.parse(res.result); if (array.length <= 0) { wx.showToast({ diff --git a/utils/net.js b/utils/net.js index 4a03b3e..3a2aee4 100644 --- a/utils/net.js +++ b/utils/net.js @@ -1,98 +1,152 @@ //不显示对话框的请求 const app = getApp() -function request(url, params, success, fail) { - this.requestLoading(url, params, "", success, fail) -} +var reconnectMethod = ''; +var reconnectParams = []; +var newReconnectMethod = ''; +var newReconnectParams = []; + -// 请求自己的服务器 -function previousRequestLoading(method, 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; + wx.request({ - url: baseUrl, + url: app.globalData.baseUrl, data: data, header: { - 'content-type': 'application/json' + 'content-type': 'application/json', + 'cookie': app.globalData.cookie }, - method: 'post', - success: function(res) { - console.log(res) + method: 'POST', + success: function (res) { + // console.log(res) if (res.data.error != null) { - wx.showModal({ - showCancel: false, - title: '执行出错', - content: res.data.error.message, - }) + 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: '执行出错', + content: res.data.error.message, + }) + } } 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 requestLoading(method, params, successaction) { +function transfer_request(method, params, successaction) { + newReconnectMethod = method; + newReconnectParams = params; wx.showLoading({ title: "加载中", }) + var newData = { - "DecryptCookie": "", - "CustomerId": app.globalData.CustomerId, - "AppendUrlString": "?appid=" + app.globalData.AppId + "&phone=" + app.globalData.Phone, + "DecryptCookie": app.globalData.cookie, + "CustomerId": app.globalData.globalCustomerID, "Method": method, "Data": params, + "AppendUrlString": "?appid=" + app.globalData.appID + "&phone=" + app.globalData.phoneNum, }; - var baseUrl = app.globalData.TranferBaseUrl; + + var baseUrl = app.globalData.tranferBaseUrl; wx.request({ url: baseUrl, data: newData, header: { - 'content-type': 'application/json' + 'content-type': 'application/json', + 'cookie': app.globalData.cookie }, - method: 'post', - success: function(res) { - console.log(res) + method: 'POST', + success: function (res) { + // console.log(res) if (res.data.error != null) { - wx.showModal({ - showCancel: false, - title: '执行出错', - content: res.data.error.message, - }) + if (res.data.error.code == 401) { + wx.request({ + url: app.globalData.tranferBaseUrl, + 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, + title: '执行出错', + content: res.data.error.message, + }) + } } 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() }, }) } module.exports = { - request: request, requestLoading: requestLoading, - previousRequestLoading: previousRequestLoading -} \ No newline at end of file + transfer_request: transfer_request +}