From 18adfffd557043869a30942f39ad46243d6872e6 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sat, 25 Aug 2018 17:52:15 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF=E5=81=9C=E8=BD=A6][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E5=81=9C=E8=BD=A6=E8=B4=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 3 +- config/config.js | 4 +-- pages/passCar/passCar.js | 77 ++++++++++++++++++++++++++-------------- 3 files changed, 54 insertions(+), 30 deletions(-) diff --git a/app.js b/app.js index 6f28d46..648f4d5 100644 --- a/app.js +++ b/app.js @@ -115,13 +115,14 @@ App({ Http.post({ url: config.api.carInit, data: { - phone: this.globalData.phone + phone: that.globalData.phone } }).then(res => { that.globalData.carLogin = true that.globalData.parkVendor = res.data.vendor if (res.data.token != "undefined") { that.globalData.etcpToken = res.data.token + console.log("etcpToken", that.globalData.etcpToken) } }) } diff --git a/config/config.js b/config/config.js index 483ced7..50fedc1 100755 --- a/config/config.js +++ b/config/config.js @@ -1,7 +1,7 @@ var config = { name: "富茂", - //url: "https://ciformall.youlane.cn/C/api", - url: "http://89e4b9c3.ngrok.io/C/api", + url: "https://ciformall.youlane.cn/C/api", + //url: "http://89e4b9c3.ngrok.io/C/api", api: { /** * 接口用途:login diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 5fa69c2..63b0a21 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -10,18 +10,17 @@ Page({ }, onLoad: function(options) { var that = this - app.userCarLogin() that.init(); }, onShow: function(options) { var that = this - console.log(options) + if (options) + console.log(options) if (that.data.addCar) { // 绑车牌 if (app.globalData.carLogin) { that.bindCar(that.data.addCar) } else { - app.userCarLogin() that.bindCar(that.data.addCar) } } @@ -93,8 +92,6 @@ Page({ }, unbindCar: function(carNum) { var that = this - // carLogin - app.userCarLogin() var postData = (app.globalData.parkVendor == 1) ? { etcpToken: app.globalData.etcpToken, @@ -131,29 +128,38 @@ Page({ var carNum = e.currentTarget.dataset.car that.unbindCar(carNum) }, + getStopFeeItem: function(carItem, i) { + var that = this + var postData = + (app.globalData.parkVendor == 1) ? { + etcpToken: app.globalData.etcpToken, + carNumber: carItem.carNumber, + } : { + carNumber: carItem.carNumber, + outCarId: carItem.outCarId, + } + var stopFee = 'carList[' + i + '].stopFee' + console.log(postData) + Http.post({ + url: config.api.getCarStopFee, + data: postData + }) + .then(res => { + console.log(res) + console.log(stopFee) + that.setData({ + [stopFee]: res.data + }) + }) + .catch(error =>{ + console.log(error) + }) + }, getStopFee: function() { var that = this + // carLogin for (var i = 0; i < that.data.carList.length; i++) { - var carItem = that.data.carList[i] - var postData = - (app.globalData.parkVendor == 1) ? { - etcpToken: app.globalData.etcpToken, - carNumber: carItem.carNumber, - } : { - carNumber: carItem.carNumber, - outCarId: carItem.outCarId, - } - var stopFee = 'carList[' + i + '].stopFee' - Http.post({ - url: config.api.getCarStopFee, - data: postData - }) - .then(res => { - console.log(res) - that.setData({ - [stopFee]: res.data - }) - }) + that.getStopFeeItem(that.data.carList[i], i) } }, initPark: function() { @@ -181,15 +187,32 @@ Page({ that.setData({ carList: res.data }) - // 获取 停车费 - that.getStopFee() }) }, init: function() { var that = this + app.parkInitCallback = token => { that.initPark() that.initUsrCarList() + if (!app.globalData.carLogin) { + // 共同登录 + Http.post({ + url: config.api.carInit, + data: { + phone: app.globalData.phone + } + }).then(res => { + app.globalData.carLogin = true + app.globalData.parkVendor = res.data.vendor + if (res.data.token != "undefined") { + app.globalData.etcpToken = res.data.token + console.log("etcpToken", app.globalData.etcpToken) + } + // 获取 停车费 + that.getStopFee() + }) + } } if (app.globalData.token && app.globalData.token != null) { app.parkInitCallback(app.globalData.token)