| @@ -25,12 +25,26 @@ Page({ | |||
| }, | |||
| onShow: function(options) { | |||
| var that = this; | |||
| that.initPark(); | |||
| Http.post({ | |||
| url: config.api.checkPhoneStatus, | |||
| data: {} | |||
| }) | |||
| .then(res => { | |||
| console.log(res); | |||
| that.init(); | |||
| that.getList(); | |||
| if (that.data.addCar) { | |||
| // 绑车牌 | |||
| if (app.globalData.carLogin) { | |||
| that.bindCar(that.data.addCar); | |||
| } else { | |||
| that.bindCar(that.data.addCar); | |||
| } | |||
| that.setData({ | |||
| addCar: null | |||
| }); | |||
| } | |||
| }) | |||
| .catch(err => { | |||
| console.log(err); | |||
| @@ -50,20 +64,6 @@ Page({ | |||
| url: "/pages/phoneinput/phoneinput"}); | |||
| } | |||
| }); | |||
| that.init(); | |||
| that.getList(); | |||
| if (that.data.addCar) { | |||
| // 绑车牌 | |||
| if (app.globalData.carLogin) { | |||
| that.bindCar(that.data.addCar); | |||
| } else { | |||
| that.bindCar(that.data.addCar); | |||
| } | |||
| that.setData({ | |||
| addCar: null | |||
| }); | |||
| } | |||
| }, | |||
| //我的停车券的显示与消失 | |||
| showquan: function() { | |||
| @@ -321,14 +321,16 @@ Page({ | |||
| that.setData({ | |||
| carList: res.data | |||
| }); | |||
| console.log("aaaa" + JSON.stringify(that.data.carList)); | |||
| console.log("initUsrCarList",JSON.stringify(that.data.carList)); | |||
| if (that.data.carList.length > 0) | |||
| that.getStopFee(); | |||
| }); | |||
| }, | |||
| init: function() { | |||
| var that = this; | |||
| app.parkInitCallback = token => { | |||
| that.initPark(); | |||
| // 获取 用户车牌 | |||
| that.initUsrCarList(); | |||
| if (!app.globalData.carLogin) { | |||
| // 共同登录 | |||
| @@ -344,8 +346,12 @@ Page({ | |||
| app.globalData.etcpToken = res.data.token; | |||
| console.log("etcpToken", app.globalData.etcpToken); | |||
| } | |||
| // 获取 用户车牌 | |||
| if(that.data.carList.length == 0) | |||
| that.initUsrCarList(); | |||
| // 获取 停车费 | |||
| that.getStopFee(); | |||
| if (that.data.carList.length > 0) | |||
| that.getStopFee(); | |||
| }); | |||
| } | |||
| }; | |||