diff --git a/config/config.js b/config/config.js index cee900d..5689f4f 100755 --- a/config/config.js +++ b/config/config.js @@ -1,8 +1,9 @@ var config = { // url: "http://10.11.207.233:7000/C/api", - url: "https://ciformall.youlane.cn/C/api", + // url: "https://ciformall.youlane.cn/C/api", // url:"https://c.malls.iformall.com/C/api", // url: "http://31adc9ce.ngrok.io/C/api", + url:'https://ctest.malls.iformall.com/C/api', api: { /** * 接口用途:login @@ -167,7 +168,7 @@ var config = { }, weapp: { - AppId: "wxea71200db93d756b" + AppId: "wx649b3be73c1afe47" }, ErrorCode: { NICK_NOT_AUTH: 11004, diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 397192e..41fab01 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -448,13 +448,13 @@ Page({ key: 'couponNum', data: "couponNum", }) - if (that.data.data.type == 5) { - setTimeout(() => { - wx.switchTab({ - url: '/pages/passCar/passCar' - }); - }, 1600); - } + // if (that.data.data.type == 5) { + // setTimeout(() => { + // wx.switchTab({ + // url: '/pages/passCar/passCar' + // }); + // }, 1600); + // } } }, fail: res => { @@ -490,13 +490,13 @@ Page({ }` }); }, 1000) - if (that.data.data.type == 5) { - setTimeout(() => { - wx.switchTab({ - url: '/pages/passCar/passCar' - }); - }, 1600); - } + // if (that.data.data.type == 5) { + // setTimeout(() => { + // wx.switchTab({ + // url: '/pages/passCar/passCar' + // }); + // }, 1600); + // } } } }) diff --git a/pages/edit/edit.js b/pages/edit/edit.js index 95be962..719a3aa 100644 --- a/pages/edit/edit.js +++ b/pages/edit/edit.js @@ -124,7 +124,7 @@ Page({ }) .catch(err => { wx.showToast({ - title: err.errMsg, + title: err.message, icon: 'none', duration: 2000, mask: false diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 58bdacd..ae738e4 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -47,6 +47,7 @@ Page({ console.log(res) }, gotoetcp:function(){ + console.log(this.data.extraData) wx.navigateToMiniProgram({ appId:'wx192b7d2e8dcbefd0', extraData: this.data.extraData, @@ -76,6 +77,8 @@ Page({ if (app.globalData.token) { that.getList(); that.init(); + }else{ + that.init(); } /** * 只有用户选择了优惠券 diff --git a/pages/passCar/passCar.wxml b/pages/passCar/passCar.wxml index af6fd53..c9566cc 100644 --- a/pages/passCar/passCar.wxml +++ b/pages/passCar/passCar.wxml @@ -61,7 +61,6 @@ - 立即支付 diff --git a/project.config.json b/project.config.json index 2ad7024..f1d8f90 100644 --- a/project.config.json +++ b/project.config.json @@ -12,7 +12,7 @@ }, "compileType": "miniprogram", "libVersion": "2.0.9", - "appid": "wxea71200db93d756b", + "appid": "wx649b3be73c1afe47", "projectname": "C", "isGameTourist": false, "condition": {