diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 0f34c02..ce3622f 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -7,7 +7,8 @@ {{data.title}}限购{{data.useLimitQuantity}}件 - 剩余时间:{{endtime}} + 剩余时间:{{endtime}} + 剩余时间:即将到期 当次有效 剩余件数:{{data.remainInventory}}件 diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js index 0e0ad4a..40161a2 100644 --- a/pages/couponorder/detail/index.js +++ b/pages/couponorder/detail/index.js @@ -21,7 +21,8 @@ Page({ console.log(options); let that = this; that.setData({ - code: options.quancode + code: options.quancode, + couponorderstatus: options.couponorderstatus }); //获得优惠券的详情 @@ -30,7 +31,7 @@ Page({ options.quancode != null && options.quancode != "" && options.quancode != undefined && - options.couponorderstatus == 0 + that.data.couponorderstatus == 0 ) { Http.get({ url: config.api.couponOrderDetail, @@ -40,8 +41,20 @@ Page({ }).then(res => { console.log(res); that.setData({ + couponorderstatus: res.data.couponOrderStatus, data: res.data }); + if (res.data.couponOrderStatus == 1) { + /** + * 动态改变上一级页面的核销状态 + */ + var pages = getCurrentPages(); + var prevPage = pages[pages.length - 2]; //上一个页面 + //直接调用上一个页面的setData()方法,把数据存到上一个页面中去 + prevPage.setData({ + mystatus: res.data.couponOrderStatus + }); + } that.setData({ expiredTime: util.fmtDate(that.data.data.expiredTime), updateDate: util.fmtDate(that.data.data.updateDate), @@ -51,7 +64,9 @@ Page({ } }, 2000); - // if (options.couponorderstatus != "0") { + /** + * 页面需要初始渲染的效果 + */ Http.get({ url: config.api.couponOrderDetail, data: { @@ -60,6 +75,7 @@ Page({ }).then(res => { console.log(res); that.setData({ + couponorderstatus: res.data.couponOrderStatus, data: res.data }); that.setData({ @@ -70,7 +86,25 @@ Page({ util.barcode("barcode", options.quancode, 510, 100); util.qrcode("qrcode", options.quancode, 350, 350); }); - // } + + // Http.get({ + // url: config.api.couponOrderDetail, + // data: { + // couponOrderId: options.quancode + // } + // }).then(res => { + // console.log(res); + // that.setData({ + // data: res.data + // }); + // that.setData({ + // expiredTime: util.fmtDate(that.data.data.expiredTime), + // updateDate: util.fmtDate(that.data.data.updateDate), + // createDate: util.fmtDate(that.data.data.createDate) + // }); + // util.barcode("barcode", options.quancode, 510, 100); + // util.qrcode("qrcode", options.quancode, 350, 350); + // }); }, phone: function() { let that = this; diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js index c453a1f..4e9d429 100644 --- a/pages/couponorder/index/index.js +++ b/pages/couponorder/index/index.js @@ -27,7 +27,8 @@ Page({ page: 1, allow_load: true, loading: true, //"上拉加载"的变量,默认false,隐藏 - content: "" + content: "", + mystatus:'' }, onLoad() { this.getList(0, 0); @@ -37,9 +38,16 @@ Page({ gotouse: function(e) { console.log(e.currentTarget.dataset.couponorderstatus); console.log("点击跳转到券详情"); + if(this.data.mystatus==''||this.data.mystatus=='undefined'){ + var mystatus = e.currentTarget.dataset.couponorderstatus; + }else{ + var mystatus = this.data.mystatus; + } + console.log(mystatus); + wx.navigateTo({ url: `/pages/couponorder/detail/index?quancode=${ - e.currentTarget.dataset.quancode}&couponorderstatus=${e.currentTarget.dataset.couponorderstatus}` + e.currentTarget.dataset.quancode}&couponorderstatus=${mystatus}` }); }, getList(key, pageNum) { diff --git a/pages/index/coupons/index.js b/pages/index/coupons/index.js index 1f281a8..3013965 100644 --- a/pages/index/coupons/index.js +++ b/pages/index/coupons/index.js @@ -46,11 +46,8 @@ Component({ list: [], allow_load: true }); - this.getList(detail.key, 1); - var val = detail.key; - //通过这个传递数据 var myEventDetail = { val: val, @@ -62,7 +59,6 @@ Component({ getList(key, pageNum) { var that = this; - app.couponListCallback = token => { Http.setToken(token); diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 0b329d1..165c0b0 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -1,6 +1,6 @@ // pages/passCar/passCar.js -let config = require('../../config/config.js') -let Http = require('../../utils/HttpBasics') +let config = require("../../config/config.js"); +let Http = require("../../utils/HttpBasics"); const app = getApp(); Page({ data: { @@ -9,63 +9,62 @@ Page({ payList: [], addCar: null, tcq: 2, - flag: '', - extraData:{} + flag: "", + extraData: {} }, /*车牌动态样式 */ - changeStyle: function () { - var height = this.data.dataHeight == '150rpx' ? '80rpx' : '150rpx'; - var lineHeight = this.data.dataHeight == '150rpx' ? '80rpx' : '150rpx'; - var fontWeight = this.data.fontWeight == '600' ? '500' : '600'; + changeStyle: function() { + var height = this.data.dataHeight == "150rpx" ? "80rpx" : "150rpx"; + var lineHeight = this.data.dataHeight == "150rpx" ? "80rpx" : "150rpx"; + var fontWeight = this.data.fontWeight == "600" ? "500" : "600"; this.setData({ dataHeight: height, dataLineHeight: lineHeight, dataFontWeight: fontWeight }); }, - onLoad: function (options) { - var that = this + onLoad: function(options) { + var that = this; that.getList(); }, - onShow: function (options) { + onShow: function(options) { var that = this; - console.log("车牌号") + console.log("车牌号"); if (that.data.addCar) { // 绑车牌 if (app.globalData.carLogin) { - that.bindCar(that.data.addCar) + that.bindCar(that.data.addCar); } else { - that.bindCar(that.data.addCar) + that.bindCar(that.data.addCar); } that.setData({ addCar: null - }) + }); } }, //我的停车券的显示与消失 - showquan: function () { + showquan: function() { let that = this; if (that.data.tcq == 1) { that.setData({ tcq: 2 - }) - } - else if (that.data.tcq == 2) { + }); + } else if (that.data.tcq == 2) { that.setData({ tcq: 1 - }) + }); } }, - jumpToAdd: function () { + jumpToAdd: function() { wx.navigateTo({ - url: '/pages/addPark/addPark', + url: "/pages/addPark/addPark" }); }, - passc: function () { + passc: function() { wx.showToast({ - title: '宝宝最可爱~', - }) + title: "宝宝最可爱~" + }); }, // orderPay: function () { // wx.redirectTo({ @@ -79,10 +78,10 @@ Page({ // } // }, //券绑定车牌 - bindCoupon: function (e) { + bindCoupon: function(e) { var that = this; - if (that.data.couponList.length>0){ - console.log('00000000000000') + if (that.data.couponList.length > 0) { + console.log("00000000000000"); console.log(e.currentTarget.dataset.checkbind); /** * 如果1 已经绑定 @@ -90,54 +89,54 @@ Page({ */ for (let car of that.data.carList) { if (car.stopFee.parkingFee) { - that.data.payList.push(car) + that.data.payList.push(car); } } var etcpData = { etcpToken: app.globalData.etcpToken, - carNumber: that.data.payList[0].carNumber ? that.data.payList[0].carNumber : '', - couponOrderId: that.data.couponList[0].id, - } - console.log(etcpData) + carNumber: that.data.payList[0].carNumber + ? that.data.payList[0].carNumber + : "", + couponOrderId: that.data.couponList[0].id + }; + console.log(etcpData); // 停简单 var tjdData = { - carNumber: that.data.payList[0].carNumber, - } - var postCouponData = (app.globalData.parkVendor == 1) ? etcpData : tjdData; + carNumber: that.data.payList[0].carNumber + }; + var postCouponData = app.globalData.parkVendor == 1 ? etcpData : tjdData; Http.post({ url: config.api.getCarCoupon, - data: postCouponData, + data: postCouponData }) .then(res => { that.setData({ - flag: '1' + flag: "1" }); // that.initUsrCarList() wx.showModal({ - title: '提示', + title: "提示", showCancel: false, content: "车牌绑定优免券成功!", - success: function (res) { - } - }) + success: function(res) {} + }); }) .catch(error => { console.log(error); if (error.code == 2056) { that.setData({ - flags: 'alreadybind' - }) + flags: "alreadybind" + }); } - }) - }else{ - console.log('1111111111111111111') + }); + } else { + console.log("1111111111111111111"); that.setData({ - flags: 'alreadybind' - }) - console.log(that.data.flags) + flags: "alreadybind" + }); + console.log(that.data.flags); } - }, //获取名下停车券列表 @@ -154,107 +153,110 @@ Page({ that.init(); that.setData({ couponList: res.data.list - }) - setTimeout(function () { + }); + setTimeout(function() { wx.hideLoading(); }, 1200); }); - }, - bindCar: function (carNum) { - var that = this - // ETCP + bindCar: function(carNum) { + var that = this; + // ETCP var etcpData = { etcpToken: app.globalData.etcpToken, - carNumber: carNum, - } + carNumber: carNum + }; var tjdData = { - carNumber: carNum, - } - var postData = (app.globalData.parkVendor == 1) ? etcpData : tjdData + carNumber: carNum + }; + var postData = app.globalData.parkVendor == 1 ? etcpData : tjdData; Http.post({ url: config.api.bindCar, - data: postData, + data: postData }) .then(res => { - console.log(res) + console.log(res); that.setData({ addCar: null - }) - that.initUsrCarList() + }); + that.initUsrCarList(); wx.showModal({ - title: '提示', + title: "提示", showCancel: false, content: "绑车牌成功!", - success: function () { } - }) + success: function() {} + }); }) .catch(error => { - console.log(error) + console.log(error); wx.showModal({ - title: '提示', + title: "提示", showCancel: false, content: error.data.message, - success: function () { } - }) - }) + success: function() {} + }); + }); }, - unbindCar: function (carNum) { - var that = this + 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, + data: postData }) .then(res => { - console.log(res) - that.initUsrCarList() + console.log(res); + that.initUsrCarList(); wx.showModal({ - title: '提示', + title: "提示", showCancel: false, content: "解绑车牌成功!", - success: function () { } - }) + success: function() {} + }); }) .catch(error => { wx.showModal({ - title: '提示', + title: "提示", showCancel: false, content: "解绑车牌失败!", - success: function () { } - }) - }) + success: function() {} + }); + }); }, - unbindCarBtn: function (e) { - console.log(e) - var that = this - var carNum = e.currentTarget.dataset.car - that.unbindCar(carNum) + unbindCarBtn: function(e) { + console.log(e); + var that = this; + var carNum = e.currentTarget.dataset.car; + that.unbindCar(carNum); }, - getStopFeeItem: function (carItem, i) { + 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' - var extraData = 'carList[' + i + '].extraData'; + 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 } }; that.setData({ extraData: extraDataStr - }) + }); Http.post({ url: config.api.getCarStopFee, data: postData @@ -267,39 +269,36 @@ Page({ [stopFee]: res.data, [extraData]: extraDataStr, buttonBox: res.data.parkingFee - }), - console.log('res>>>' + JSON.stringify(that.data.buttonBox)) - + console.log("res>>>" + JSON.stringify(that.data.buttonBox)); }) .catch(error => { - console.log(error) - }) + console.log(error); + }); }, - getStopFee: function () { - var that = this + getStopFee: function() { + var that = this; // carLogin for (var i = 0; i < that.data.carList.length; i++) { - that.getStopFeeItem(that.data.carList[i], i) + that.getStopFeeItem(that.data.carList[i], i); } // console.log(JSON.stringify(getStopFeeItem)) }, - initPark: function () { - var that = this + initPark: function() { + var that = this; // 车场信息获取 Http.get({ url: config.api.getParkInfo, data: {} - }) - .then(res => { - that.setData({ - park: res.data, - }) - }) + }).then(res => { + that.setData({ + park: res.data + }); + }); }, - initUsrCarList: function () { - var that = this + initUsrCarList: function() { + var that = this; // 绑定车获取 Http.get({ url: config.api.getUserCarList, @@ -307,18 +306,16 @@ Page({ }).then(res => { that.setData({ carList: res.data - }) - console.log('aaaa' + JSON.stringify(that.data.carList) ); - - - }) + }); + console.log("aaaa" + JSON.stringify(that.data.carList)); + }); }, - init: function () { - var that = this + init: function() { + var that = this; app.parkInitCallback = token => { - that.initPark() - that.initUsrCarList() + that.initPark(); + that.initUsrCarList(); if (!app.globalData.carLogin) { // 共同登录 Http.post({ @@ -327,19 +324,19 @@ Page({ phone: app.globalData.phone } }).then(res => { - app.globalData.carLogin = true - app.globalData.parkVendor = res.data.vendor + 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) + app.globalData.etcpToken = res.data.token; + console.log("etcpToken", app.globalData.etcpToken); } // 获取 停车费 - that.getStopFee() - }) + that.getStopFee(); + }); } - } + }; if (app.globalData.token && app.globalData.token != null) { - app.parkInitCallback(app.globalData.token) + app.parkInitCallback(app.globalData.token); } } -}) \ No newline at end of file +});