diff --git a/config/config.js b/config/config.js index 98a0aac..1096a94 100755 --- a/config/config.js +++ b/config/config.js @@ -1,7 +1,7 @@ var config = { name: "富茂科技", - url: "https://ciformall.youlane.cn/C/api", - // url: "http://fd1a0cab.ngrok.io/C/api", + //url: "https://ciformall.youlane.cn/C/api", + url: "http://31adc9ce.ngrok.io/C/api", api: { /** * 接口用途:login @@ -108,7 +108,7 @@ var config = { /** * 优免券领取 */ - getCoupon: "/car/getCoupon", + getCarCoupon: "/car/getCoupon", /** * banner */ diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index aebba2a..12e046e 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -11,24 +11,6 @@ Page({ tcq: 2, flag:'' }, - // ready() { - // app.couponChannelListCallback = token => { - // Http.setToken(token); - // Http.get({ - // url: config.api.couponChannelList, - // data: { - // pageNum: 1, - // pageSize: 2, - // targetAd: 2 - // } - // }).then(res => { - // console.log(res); - // this.setData({ - // list: res.data.list - // }); - // }); - // }; - // }, /*车牌动态样式 */ changeStyle: function () { var height = this.data.dataHeight == '150rpx' ? '80rpx' : '150rpx'; @@ -114,7 +96,7 @@ Page({ etcpToken: app.globalData.etcpToken, carNumber: that.data.payList[0].carNumber ? that.data.payList[0].carNumber:'', couponFreeId:5655, - merchantId: 5655, + merchantId: '196123418314145793', } console.log('--->>>'+JSON.stringify(etcpData)) // 停简单 @@ -130,7 +112,7 @@ Page({ // title: '00000', // }) Http.post({ - url: config.api.getCoupon, + url: config.api.getCarCoupon, data: postCouponData, }) .then(res => {