From 3259e4d8803c086d506257a3a5d22e1f3e4de5d1 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Wed, 12 Sep 2018 16:21:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?etcp=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/passCar/passCar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 23b9749..abe5004 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -25,6 +25,7 @@ Page({ }, onLoad: function(options) { var that = this; + that.init(); that.getList(); }, @@ -139,7 +140,6 @@ Page({ couponOrderStatus: 0 } }).then(res => { - that.init(); that.setData({ couponList: res.data.list }); @@ -182,7 +182,7 @@ Page({ wx.showModal({ title: "提示", showCancel: false, - content: error.data.message, + content: error.message, success: function() {} }); }); From d73ff4b3440d19c8e8c2b1c0dcd93b243499acef Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Wed, 12 Sep 2018 19:19:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[=E5=81=9C=E8=BD=A6=E9=A1=B5=E9=9D=A2,?= =?UTF-8?q?=E5=85=8D=E8=B4=B9=E4=B9=B0=E5=88=B8=E4=B9=9F=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=88=B0=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?][=E5=A2=9E=E5=8A=A0]:=E5=81=9C=E8=BD=A6=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=8E=88=E6=9D=83=E7=9A=84=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=EF=BC=8C=E5=85=8D=E8=B4=B9=E9=A2=86=E5=88=B8=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=88=B0=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 2 +- pages/coupon/detail/index.js | 29 +++++---- pages/getphoneInfo/index.js | 66 ++++++++++++-------- pages/passCar/passCar.js | 113 +++++++++++++++++++++-------------- pages/passCar/passCar.json | 2 +- 5 files changed, 128 insertions(+), 84 deletions(-) diff --git a/app.json b/app.json index e10756e..730c880 100644 --- a/app.json +++ b/app.json @@ -36,7 +36,7 @@ "text": "首页" }, { - "pagePath": "pages/cartest/cartest", + "pagePath": "pages/passCar/passCar", "iconPath": "assets/img/pass1.png", "selectedIconPath": "assets/img/pass0.png", "text": "停车" diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index a83b2a5..1455681 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -313,22 +313,16 @@ Page({ wx.showToast({ title: "购买成功", image: "./../../../assets/img/success.png", - duration: 2000, + duration: 1000, mask: false, success: function () { - wx.showLoading({ - title: "加载中..." - }); setTimeout(function () { - wx.hideLoading(); - }, 1600); - setTimeout(() => { - wx.redirectTo({ + wx.navigateTo({ url: `/pages/order/detail/index?orderId=${ that.data.orderId - }` + }` }); - }, 1600); + }, 1000) } }); @@ -395,9 +389,20 @@ Page({ }) wx.showToast({ title: "领取成功", - duration: 3000, - image: "./../../../assets/img/success.png" + image: "./../../../assets/img/success.png", + duration: 1000, + mask: false, + success:function(){ + setTimeout(function(){ + wx.navigateTo({ + url: `/pages/order/detail/index?orderId=${ + that.data.orderId + }` + }); + },1000) + } }); + //////////////////////////停车券 console.log(that.data.data.type) if (that.data.data.type == 5) { diff --git a/pages/getphoneInfo/index.js b/pages/getphoneInfo/index.js index f26ae5a..ed6e877 100755 --- a/pages/getphoneInfo/index.js +++ b/pages/getphoneInfo/index.js @@ -5,16 +5,26 @@ Page({ data: { canIUse: wx.canIUse("button.open-type.getPhoneNumber"), couponChannelId: "", - couponId: "" + couponId: "", + flag:0 }, - onLoad: function(options) { + onLoad: function (options) { var that = this; console.log(options); - that.setData({ - couponChannelId: options.couponChannelId, - couponId: options.couponId - }); - + if (JSON.stringify(options)=='{}'){ + console.log("null"), + that.setData({ + flag:0 + }) + } + if (JSON.stringify(options)!='{}') { + console.log("bushi null"); + that.setData({ + couponChannelId: options.couponChannelId, + couponId: options.couponId, + flag:1 + }); + } Http.get({ url: config.api.marketicon, data: { @@ -27,7 +37,7 @@ Page({ }); }); }, - getPhoneNumber: function(e) { + getPhoneNumber: function (e) { var that = this; var iv = e.detail.iv; var encryptedData = e.detail.encryptedData; @@ -38,29 +48,33 @@ Page({ iv: iv } }).then( - function(res) { + function (res) { console.log(res); console.log("这是用户授权手机号的结果"); - console.log(that.data.couponChannelId); - console.log(that.data.couponId); console.log("这是从立即支付传回来的值 因为用户没有授权手机号"); app.globalData.phone = res.data.phone; - wx.showToast({ - title: res.data.msg, - icon: "success", - success: function(res) { - wx.redirectTo({ - url: - "/pages/coupon/detail/index?couponChannelId=" + - that.data.couponChannelId + - "&couponId=" + - that.data.couponId + - "&flag=pay" - }); - } - }); + if(that.data.flag == 0){ + wx.switchTab({ + url: '/pages/passCar/passCar', + }) + }else{ + wx.showToast({ + title: res.data.msg, + icon: "success", + success: function (res) { + wx.redirectTo({ + url: + "/pages/coupon/detail/index?couponChannelId=" + + that.data.couponChannelId + + "&couponId=" + + that.data.couponId + + "&flag=pay" + }); + } + }); + } }, - function(error) { + function (error) { wx.showToast({ title: "请重新授权手机号", icon: "none" diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index abe5004..0537969 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -23,15 +23,36 @@ Page({ dataFontWeight: fontWeight }); }, - onLoad: function(options) { + onShow: function(options) { var that = this; + Http.post({ + url: config.api.checkPhoneStatus, + data: {} + }) + .then(res => { + console.log(res); + }) + .catch(err => { + console.log(err); + console.log("我即将要跳转到用户手机号授权的页面"); + if (err.code == 11005) { + // 用户手机未授权 + /** + * 将值传到用户手机号授权的页面 + * + */ + wx.navigateTo({ + url: "/pages/getphoneInfo/index"}); + } + if (err.code == 11006) { + // 用户手机已加密 + wx.navigateTo({ + url: "/pages/phoneinput/phoneinput"}); + } + }); + that.init(); that.getList(); - }, - - onShow: function(options) { - var that = this; - console.log("车牌号"); if (that.data.addCar) { // 绑车牌 if (app.globalData.carLogin) { @@ -84,9 +105,9 @@ Page({ } var etcpData = { etcpToken: app.globalData.etcpToken, - carNumber: that.data.payList[0].carNumber - ? that.data.payList[0].carNumber - : "", + carNumber: that.data.payList[0].carNumber ? + that.data.payList[0].carNumber : + "", couponOrderId: that.data.couponList[0].id }; console.log(etcpData); @@ -97,9 +118,9 @@ Page({ var postCouponData = app.globalData.parkVendor == 1 ? etcpData : tjdData; Http.post({ - url: config.api.getCarCoupon, - data: postCouponData - }) + url: config.api.getCarCoupon, + data: postCouponData + }) .then(res => { that.setData({ flag: "1" @@ -161,9 +182,9 @@ Page({ }; var postData = app.globalData.parkVendor == 1 ? etcpData : tjdData; Http.post({ - url: config.api.bindCar, - data: postData - }) + url: config.api.bindCar, + data: postData + }) .then(res => { console.log(res); that.setData({ @@ -190,18 +211,18 @@ Page({ unbindCar: function(carNum) { var that = this; var postData = - app.globalData.parkVendor == 1 - ? { - etcpToken: app.globalData.etcpToken, - carNumber: carNum - } - : { - carNumber: carNum - }; + app.globalData.parkVendor == 1 ? + { + etcpToken: app.globalData.etcpToken, + carNumber: carNum + } : + { + carNumber: carNum + }; Http.post({ - url: config.api.unbindCar, - data: postData - }) + url: config.api.unbindCar, + data: postData + }) .then(res => { console.log(res); that.initUsrCarList(); @@ -230,35 +251,39 @@ Page({ 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 - }; + app.globalData.parkVendor == 1 ? + { + etcpToken: app.globalData.etcpToken, + carNumber: carItem.carNumber + } : + { + carNumber: carItem.carNumber, + outCarId: carItem.outCarId + }; var stopFee = "carList[" + i + "].stopFee"; var extraData = "carList[" + i + "].extraData"; console.log(extraData); - var extraDataStr = { params: { CarNumber: carItem.carNumber } }; + var extraDataStr = { + params: { + CarNumber: carItem.carNumber + } + }; that.setData({ extraData: extraDataStr }); Http.post({ - url: config.api.getCarStopFee, - data: postData - }) + url: config.api.getCarStopFee, + data: postData + }) .then(res => { /** * 停车费用 */ that.setData({ - [stopFee]: res.data, - [extraData]: extraDataStr, - buttonBox: res.data.parkingFee - }), + [stopFee]: res.data, + [extraData]: extraDataStr, + buttonBox: res.data.parkingFee + }), console.log("res>>>" + JSON.stringify(that.data.buttonBox)); }) .catch(error => { @@ -328,4 +353,4 @@ Page({ app.parkInitCallback(app.globalData.token); } } -}); +}); \ No newline at end of file diff --git a/pages/passCar/passCar.json b/pages/passCar/passCar.json index 9e03f40..83aeba7 100644 --- a/pages/passCar/passCar.json +++ b/pages/passCar/passCar.json @@ -1,5 +1,5 @@ { "component": true, "usingComponents": {}, - "navigationBarTitleText": "车辆管理" + "navigationBarTitleText": "停车" } \ No newline at end of file From 19a6a2670b094aa20938b26c071fea0860c6c8e6 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Wed, 12 Sep 2018 19:33:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A][=E4=BF=AE=E6=94=B9]:=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=9B=B4=E5=A4=9A=EF=BC=8C=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=B0=8F=E4=BA=8E5=E7=9A=84=E6=97=B6=E5=80=99=E9=9A=90?= =?UTF-8?q?=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/rushToBuy/index.wxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/index/rushToBuy/index.wxml b/pages/index/rushToBuy/index.wxml index d2ae3b0..537c0a5 100644 --- a/pages/index/rushToBuy/index.wxml +++ b/pages/index/rushToBuy/index.wxml @@ -1,5 +1,5 @@ - 限时抢购查看更多 + 限时抢购查看更多 From 473fe5633ae3b3b4d52d5d8653359a3db4c0abdc Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Thu, 13 Sep 2018 06:46:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/passCar/passCar.js | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 0537969..dba521f 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -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(); }); } };