浏览代码

Merge branch 'dev' into HuNan_test

tags/湖南版5.1.4
meo 6 年前
父节点
当前提交
08381ec52d
共有 1 个文件被更改,包括 2 次插入4 次删除
  1. +2
    -4
      pages/passCar/passCar.js

+ 2
- 4
pages/passCar/passCar.js 查看文件

@@ -57,7 +57,7 @@ Page({
paySuccess:function(){ paySuccess:function(){
wx.showModal({ wx.showModal({
title: '支付成功', title: '支付成功',
content: '可立即离场',
content: '请尽快离场',
showCancel:false showCancel:false
}) })
}, },
@@ -92,14 +92,12 @@ Page({
}, },
onShow: function (options) { onShow: function (options) {
var that = this; var that = this;
console.log(that.data.ifHaveCarModular)
that.setData({ that.setData({
etcpAppId: extConfig.attr.etcpAppId, etcpAppId: extConfig.attr.etcpAppId,
etcpVersion: extConfig.attr.etcpVersion, etcpVersion: extConfig.attr.etcpVersion,
etcpCallbackUrl: extConfig.attr.etcpCallbackUrl, etcpCallbackUrl: extConfig.attr.etcpCallbackUrl,
ifHaveCarModular: extConfig.attr.ifHaveCarModular ifHaveCarModular: extConfig.attr.ifHaveCarModular
}) })
console.log(that.data.ifHaveCarModular)
if (app.globalData.token) { if (app.globalData.token) {
that.getList(); that.getList();
that.init(); that.init();
@@ -111,6 +109,7 @@ Page({
* 才会进行券和车牌的绑定 * 才会进行券和车牌的绑定
*/ */
if (wx.getStorageSync("chosed") && that.data.quanid) { if (wx.getStorageSync("chosed") && that.data.quanid) {
that.getStopFee(that.data.listCardNum);
that.bindCoupon(that.data.quanid); that.bindCoupon(that.data.quanid);
wx.setStorage({ wx.setStorage({
key: 'chosed', key: 'chosed',
@@ -581,7 +580,6 @@ Page({
stopFees: res.data, stopFees: res.data,
timecha: Util.timecha(res.data.exitTime, res.data.entranceTime) timecha: Util.timecha(res.data.exitTime, res.data.entranceTime)
}); });
console.log(that.data.stopFees)
that.setData({ that.setData({
scroll: true scroll: true
}) })


正在加载...
取消
保存