diff --git a/app.json b/app.json index 0de250e..ee35fd2 100644 --- a/app.json +++ b/app.json @@ -68,7 +68,7 @@ "text": "首页" }, { - "pagePath": "pages/cartest/cartest", + "pagePath": "pages/passCar/passCar", "iconPath": "assets/images/pass1.png", "selectedIconPath": "assets/images/pass0.png", "text": "停车" diff --git a/config/config.js b/config/config.js index d7b20b3..534b3b9 100755 --- a/config/config.js +++ b/config/config.js @@ -2,8 +2,8 @@ var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; var appId = extConfig.appId; var config = { // url: "https://ciformall.youlane.cn/C/api", - url:"https://c.malls.iformall.com/C/api", - // url:'https://ctest.malls.iformall.com/C/api', + // url:"https://c.malls.iformall.com/C/api", + url:'https://ctest.malls.iformall.com/C/api', // url:'http://10.100.33.70:7000/C/api', // url: 'http://202.165.179.86:4000/C/api', api: { @@ -219,7 +219,7 @@ var config = { }, weapp: { - AppId: "wx30caec1cc16c4634" + AppId: "wx649b3be73c1afe47" }, ErrorCode: { diff --git a/pages/bargain/bargainDatail/bargainDatail.js b/pages/bargain/bargainDatail/bargainDatail.js index 77d7fcb..566e26d 100644 --- a/pages/bargain/bargainDatail/bargainDatail.js +++ b/pages/bargain/bargainDatail/bargainDatail.js @@ -69,7 +69,7 @@ Page({ */ getPressOrderStatus: function(orderId) { let that = this; - Http.post({ + Http.get({ url: config.api.getPressOrderStatus, data: { orderId: orderId diff --git a/pages/index/index.js b/pages/index/index.js index 0135e6d..b29ec3b 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -69,6 +69,10 @@ Page({ wx.redirectTo({ url: `/pages/getuserinfo/index?orderId=${orderId}&from='${"discount"}` }); + } else { + wx.redirectTo({ + url: `/pages/getuserinfo/index` + }); } } }); diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index 17c253b..417fa7a 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -557,7 +557,7 @@ Page({ syncId: res.data.orderId, payType: 6, // 小程序支付 CarNumber: carNumber, - returnUrl: "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback", + returnUrl: "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", source: "FUMAO-001", actionId: "1" //操作ID,1:小程序支付 } diff --git a/pages/user/index.wxml b/pages/user/index.wxml index 1a503a6..70208d8 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -53,7 +53,7 @@ - + 智能停车 @@ -76,7 +76,7 @@ - 版本号:3.3.1 + 版本号:3.3.2 diff --git a/project.config.json b/project.config.json index 2ff403f..2970aaf 100644 --- a/project.config.json +++ b/project.config.json @@ -4,7 +4,7 @@ "ignore": [] }, "setting": { - "urlCheck": true, + "urlCheck": false, "es6": true, "postcss": true, "minified": true, @@ -13,7 +13,7 @@ }, "compileType": "miniprogram", "libVersion": "2.0.9", - "appid": "wx30caec1cc16c4634", + "appid": "wx649b3be73c1afe47", "projectname": "C", "isGameTourist": false, "condition": {