diff --git a/config/config.js b/config/config.js index 1a4d95c..245a24b 100755 --- a/config/config.js +++ b/config/config.js @@ -161,7 +161,7 @@ var config = { }, weapp: { - AppId: "wx649b3be73c1afe47" + AppId: "wx026ee7f6290aa336" }, ErrorCode: { NICK_NOT_AUTH: 11004, diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index c33ebec..586b16e 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -45,18 +45,18 @@ Page({ }) }, gotoetcp:function(){ + /* wx.navigateToMiniProgram({ appId:'wx192b7d2e8dcbefd0', extraData: this.data.extraData, envVersion:'release' }) - /* + */ wx.navigateToMiniProgram({ appId:'wxc07f9d67923d676d', extraData: this.data.extraData, envVersion:'release' }) - */ }, showquan: function() { wx.navigateTo({ @@ -119,13 +119,13 @@ Page({ title: weapNote.carpage.title }) }); - // 登录 - var scene = decodeURIComponent(options.scene); - that.setData({ - scene: scene - }); - app.getLocation(); + // 登录 + var scene = decodeURIComponent(options.scene); + that.setData({ + scene: scene + }); if (app.globalData.token){}else{ + app.getLocation(); that.userLogin() } }, @@ -377,44 +377,6 @@ Page({ app.parkInitCallback(app.globalData.token); } }, - /** - * 绑定车牌 - */ - // bindCar: function(carNum) { - // var that = this; - // // ETCP - // var etcpData = { - // etcpToken: app.globalData.etcpToken, - // carNumber: carNum - // }; - // var tjdData = { - // carNumber: carNum - // }; - // var postData = app.globalData.parkVendor == 1 ? etcpData : tjdData; - // Http.post({ - // url: config.api.bindCar, - // data: postData - // }) - // .then(res => { - // console.log(res); - // // that.initUsrCarList(); - // wx.showModal({ - // title: "提示", - // showCancel: false, - // content: "绑车牌成功!", - // success: function() {} - // }); - // }) - // .catch(error => { - // console.log(error); - // wx.showModal({ - // title: "提示", - // showCancel: false, - // content: error.message, - // success: function() {} - // }); - // }); - // }, bindCar: function (carNum) { var that = this; diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml index daefe25..b4646c2 100644 --- a/pages/passCar/passCar.wxml +++ b/pages/passCar/passCar.wxml @@ -61,14 +61,14 @@ + 立即支付 - --> 立即支付 diff --git a/project.config.json b/project.config.json index 9e27bef..3b57d21 100644 --- a/project.config.json +++ b/project.config.json @@ -12,8 +12,8 @@ }, "compileType": "miniprogram", "libVersion": "2.0.9", - "appid": "wx649b3be73c1afe47", - "projectname": "%E5%AF%8C%E8%8C%82%E9%93%BE%E5%AE%A2", + "appid": "wx026ee7f6290aa336", + "projectname": "C", "isGameTourist": false, "condition": { "search": {