diff --git a/app.js b/app.js index 9eea4f3..ec666b5 100644 --- a/app.js +++ b/app.js @@ -23,10 +23,12 @@ App({ console.log("req",res); that.globalData.token = res.data.token; Http.setToken(res.data.token) - if (that.tokenCallback) { - that.tokenCallback(res.data.token); + if (that.couponChannelListCallback) { + that.couponChannelListCallback(that.globalData.token); + } + if (that.couponListCallback) { + that.couponListCallback(that.globalData.token); } - return Http.post({ url: config.api.checkUserStatus, data: {} diff --git a/app.json b/app.json index 56ac32c..3f32221 100644 --- a/app.json +++ b/app.json @@ -16,8 +16,8 @@ "pages/success/index", "pages/login/index", "pages/park/park", - "pages/addPark/addPark", - "pages/passCar/passCar" + "pages/passCar/passCar", + "pages/addPark/addPark" ], "tabBar": { "color":"#9F9F9F", @@ -28,7 +28,7 @@ "selectedIconPath":"assets/img/home-y.png", "text": "首页" }, { - "pagePath": "pages/addPark/addPark", + "pagePath": "pages/passCar/passCar", "iconPath": "assets/img/pass1.png", "selectedIconPath": "assets/img/pass0.png", "text": "停车" diff --git a/config/config.js b/config/config.js index b724cc7..679e63b 100755 --- a/config/config.js +++ b/config/config.js @@ -75,6 +75,10 @@ var config = { * 车场信息获取 */ getParkInfo: '/wxPark/info', + /** + * 用户所绑车牌获取 + */ + getUserCarList: '/user/carlist', /** * 联合登录 */ diff --git a/pages/addPark/addPark.js b/pages/addPark/addPark.js index fb1e883..4ca3194 100644 --- a/pages/addPark/addPark.js +++ b/pages/addPark/addPark.js @@ -59,6 +59,7 @@ Page({ }, jumpTo: function () { + // 返回 wx.redirectTo({ url: '/pages/passCar/passCar' }); diff --git a/pages/index/coupons/index.js b/pages/index/coupons/index.js index 0530259..c3312ba 100644 --- a/pages/index/coupons/index.js +++ b/pages/index/coupons/index.js @@ -42,17 +42,17 @@ Component({ }, ready() { var that = this - var pageNum = 1 - if (app.globalData.token && app.globalData.token != null) { + app.couponListCallback = token =>{ + Http.setToken(token) // business获取 Http.get({ - url: config.api.businessList, - data: { - pageNum: pageNum, - pageSize: 10, - type: 1 - } - }) + url: config.api.businessList, + data: { + pageNum: 1, + pageSize: 10, + type: 1 + } + }) .then(res => { console.log(res) that.setData({ @@ -63,7 +63,7 @@ Component({ Http.get({ url: config.api.couponList, data: { - pageNum: pageNum, + pageNum: 1, pageSize: 10 } }).then(res => { @@ -72,37 +72,9 @@ Component({ list: res.data.list }) }) - } else { - app.couponListCallback = token => { - // business获取 - Http.get({ - url: config.api.businessList, - data: { - pageNum: pageNum, - pageSize: 10, - type: 1 - } - }) - .then(res => { - console.log(res) - that.setData({ - tabs: res.data.list - }) - }) - // 券list获取 - Http.get({ - url: config.api.couponList, - data: { - pageNum: pageNum, - pageSize: 10 - } - }).then(res => { - console.log(res); - that.setData({ - list: res.data.list - }) - }) - } + } + if (app.globalData.token && app.globalData.token != null) { + app.couponListCallback(app.globalData.token) } } }) \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 1ae5186..29f9fe7 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -27,23 +27,11 @@ Page({ var that = this; if (app.globalData.token && app.globalData.token != null) { console.log("index ++ " + app.globalData.token); - if (that.couponChannelListCallback) { - that.couponChannelListCallback(res.data.token); - } - if (that.couponListCallback) { - that.couponListCallback(res.data.token); - } } else { // 由于是网络请求,可能会在 Page.onLoad 之后才返回 // 所以此处加入 callback 以防止这种情况 app.tokenCallback = token => { console.log("index + " + token); - if (that.couponChannelListCallback) { - that.couponChannelListCallback(res.data.token); - } - if (that.couponListCallback) { - that.couponListCallback(res.data.token); - } } } wx.showLoading({ diff --git a/pages/index/rushToBuy/index.js b/pages/index/rushToBuy/index.js index 5401ef3..62f492b 100644 --- a/pages/index/rushToBuy/index.js +++ b/pages/index/rushToBuy/index.js @@ -52,7 +52,9 @@ Component({ methods: { }, ready() { - if (app.globalData.token && app.globalData.token != null) { + app.couponChannelListCallback = token => { + console.log("couponChannelList init"); + Http.setToken(token); Http.get({ url: config.api.couponChannelList, data: { @@ -64,21 +66,10 @@ Component({ list: res.data.list }) }) - } else { - app.couponChannelListCallback = token => { - Http.setToken(token); - Http.get({ - url: config.api.couponChannelList, - data: { - pageNum: 1, - pageSize: 10 - } - }).then(res => { - this.setData({ - list: res.data.list - }) - }) - } + } + if (app.globalData.token && app.globalData.token != null) { + console.log("couponChannelList init 1"); + app.couponChannelListCallback(app.globalData.token) } } }) \ No newline at end of file diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 742b7aa..86c49db 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -1,10 +1,15 @@ // pages/passCar/passCar.js +const app = getApp(); Component({ properties: { }, data: { + parkVendor: 1, + park: null, + carList: [], + etcpToken: null, }, methods: { jumpToAdd: function() { @@ -32,20 +37,72 @@ Component({ url: '/pages/pay/pay' }); }, - delete: function () { - wx.showModal({ - title: '提示', - showCancel: false, - content: "删除车牌成功!", - success: function () { - wx.redirectTo({ - url: '/pages/passCar/passCar' - }); - // wx.switchTab({ - // url: '/pages/index/index', - // }); - } - }) + unbindCar: function() { + var that = this + // ETCP + var etcpData = { + etcpToken: that.data.etcpToken, + carNumber: null, + } + // 停简单 + var tjdData = { + carNumber: null, + carNumColor: null, + outCarId: null, + } + var postData = (parkVendor == 1) ? etcpData : tjdData + Http.post({ + url: config.api.unbindCar, + data: postData, + }) + .then(res => { + console.log(res) + wx.showModal({ + title: '提示', + showCancel: false, + content: "解绑车牌成功!", + success: function() {} + }) + }) + .catch(error => { + wx.showModal({ + title: '提示', + showCancel: false, + content: "解绑车牌失败!", + success: function () { } + }) + }) }, + }, + ready() { + var that = this + initCallback = token => { + // 车场信息获取 + Http.get({ + url: config.api.getParkInfo, + data: {} + }) + .then(res => { + console.log(res) + that.setData({ + tabs: res.data + }) + }) + //绑定车获取 + Http.get({ + url: config.api.getUserCarList, + data: {} + }).then(res => { + console.log(res); + that.setData({ + carList: res.data + }) + }) + } + if (app.globalData.token && app.globalData.token != null) { + initCallback(app.globalData.token) + } else { + initCallback(app.globalData.token) + } } }) \ No newline at end of file diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml index 659eb96..219bcea 100644 --- a/pages/passCar/passCar.wxml +++ b/pages/passCar/passCar.wxml @@ -17,7 +17,7 @@ 京C·21457 - + 点击添加我的爱车