@@ -68,7 +68,7 @@ | |||||
"text": "首页" | "text": "首页" | ||||
}, | }, | ||||
{ | { | ||||
"pagePath": "pages/cartest/cartest", | |||||
"pagePath": "pages/passCar/passCar", | |||||
"iconPath": "assets/images/pass1.png", | "iconPath": "assets/images/pass1.png", | ||||
"selectedIconPath": "assets/images/pass0.png", | "selectedIconPath": "assets/images/pass0.png", | ||||
"text": "停车" | "text": "停车" | ||||
@@ -2,8 +2,8 @@ var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; | |||||
var appId = extConfig.appId; | var appId = extConfig.appId; | ||||
var config = { | var config = { | ||||
// url: "https://ciformall.youlane.cn/C/api", | // 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://10.100.33.70:7000/C/api', | ||||
// url: 'http://202.165.179.86:4000/C/api', | // url: 'http://202.165.179.86:4000/C/api', | ||||
api: { | api: { | ||||
@@ -219,7 +219,7 @@ var config = { | |||||
}, | }, | ||||
weapp: { | weapp: { | ||||
AppId: "wx30caec1cc16c4634" | |||||
AppId: "wx649b3be73c1afe47" | |||||
}, | }, | ||||
ErrorCode: { | ErrorCode: { | ||||
@@ -69,7 +69,7 @@ Page({ | |||||
*/ | */ | ||||
getPressOrderStatus: function(orderId) { | getPressOrderStatus: function(orderId) { | ||||
let that = this; | let that = this; | ||||
Http.post({ | |||||
Http.get({ | |||||
url: config.api.getPressOrderStatus, | url: config.api.getPressOrderStatus, | ||||
data: { | data: { | ||||
orderId: orderId | orderId: orderId | ||||
@@ -69,6 +69,10 @@ Page({ | |||||
wx.redirectTo({ | wx.redirectTo({ | ||||
url: `/pages/getuserinfo/index?orderId=${orderId}&from='${"discount"}` | url: `/pages/getuserinfo/index?orderId=${orderId}&from='${"discount"}` | ||||
}); | }); | ||||
} else { | |||||
wx.redirectTo({ | |||||
url: `/pages/getuserinfo/index` | |||||
}); | |||||
} | } | ||||
} | } | ||||
}); | }); | ||||
@@ -557,7 +557,7 @@ Page({ | |||||
syncId: res.data.orderId, | syncId: res.data.orderId, | ||||
payType: 6, // 小程序支付 | payType: 6, // 小程序支付 | ||||
CarNumber: carNumber, | CarNumber: carNumber, | ||||
returnUrl: "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback", | |||||
returnUrl: "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", | |||||
source: "FUMAO-001", | source: "FUMAO-001", | ||||
actionId: "1" //操作ID,1:小程序支付 | actionId: "1" //操作ID,1:小程序支付 | ||||
} | } | ||||
@@ -53,7 +53,7 @@ | |||||
</view> | </view> | ||||
</view> | </view> | ||||
</navigator> | </navigator> | ||||
<navigator url="/pages/cartest/cartest" open-type="switchTab"> | |||||
<navigator url="/pages/passCar/passCar" open-type="switchTab"> | |||||
<view class="user-btn app-border-bottom"> | <view class="user-btn app-border-bottom"> | ||||
<view> | <view> | ||||
<image class='icons' src="{{cheUrl}}" mode='widthFix'></image>智能停车</view> | <image class='icons' src="{{cheUrl}}" mode='widthFix'></image>智能停车</view> | ||||
@@ -76,7 +76,7 @@ | |||||
<view class="margin"></view> | <view class="margin"></view> | ||||
<!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | <!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | ||||
<view bindlongtap='showVersion' class='version'> | <view bindlongtap='showVersion' class='version'> | ||||
<view wx:if="{{flag=='show'}}">版本号:3.3.1</view> | |||||
<view wx:if="{{flag=='show'}}">版本号:3.3.2</view> | |||||
<view wx:if="{{flag=='hidden'}}"></view> | <view wx:if="{{flag=='hidden'}}"></view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
@@ -4,7 +4,7 @@ | |||||
"ignore": [] | "ignore": [] | ||||
}, | }, | ||||
"setting": { | "setting": { | ||||
"urlCheck": true, | |||||
"urlCheck": false, | |||||
"es6": true, | "es6": true, | ||||
"postcss": true, | "postcss": true, | ||||
"minified": true, | "minified": true, | ||||
@@ -13,7 +13,7 @@ | |||||
}, | }, | ||||
"compileType": "miniprogram", | "compileType": "miniprogram", | ||||
"libVersion": "2.0.9", | "libVersion": "2.0.9", | ||||
"appid": "wx30caec1cc16c4634", | |||||
"appid": "wx649b3be73c1afe47", | |||||
"projectname": "C", | "projectname": "C", | ||||
"isGameTourist": false, | "isGameTourist": false, | ||||
"condition": { | "condition": { | ||||