@@ -751,7 +751,7 @@ Page({ | |||||
}) | }) | ||||
.then(res => { | .then(res => { | ||||
console.log(res) | console.log(res) | ||||
if(app.globalData.parkVendor != 5){ | |||||
if(app.globalData.parkVendor == 1){ | |||||
var extraDataStr = { | var extraDataStr = { | ||||
params: { | params: { | ||||
token: app.globalData.etcpToken, | token: app.globalData.etcpToken, | ||||
@@ -764,6 +764,7 @@ Page({ | |||||
} | } | ||||
} | } | ||||
that.setData({ | that.setData({ | ||||
parkVendor: app.globalData.parkVendor, | |||||
extraData: extraDataStr, | extraData: extraDataStr, | ||||
stopFees: res.data, | stopFees: res.data, | ||||
timecha: Util.timecha(res.data.exitTime, res.data.entranceTime) | timecha: Util.timecha(res.data.exitTime, res.data.entranceTime) | ||||
@@ -780,6 +781,7 @@ Page({ | |||||
} | } | ||||
} | } | ||||
that.setData({ | that.setData({ | ||||
parkVendor: app.globalData.parkVendor, | |||||
extraData: extraDataStr, | extraData: extraDataStr, | ||||
stopFees: { | stopFees: { | ||||
orderId: res.data.order_id, | orderId: res.data.order_id, | ||||
@@ -52,7 +52,7 @@ | |||||
</navigator> | </navigator> | ||||
<view wx:if="{{!canIUse}}" class='buy' data-flag="parkVendor1" bindtap='gotoetcp'>立即支付</view> | <view wx:if="{{!canIUse}}" class='buy' data-flag="parkVendor1" bindtap='gotoetcp'>立即支付</view> | ||||
</view> | </view> | ||||
<view class="buy-view" wx:if="{{stopFees.orderId&&stopFees.remainingFee>0&&app.globalData.parkVendor==5}}"> | |||||
<view class="buy-view" wx:if="{{stopFees.orderId&&stopFees.remainingFee>0&&app.globalData.parkVendor!=1}}"> | |||||
<navigator bindfail="bindfail" path="pages/park/park" wx:if="{{canIUse}}" class='buy' target="miniProgram" open-type="navigate" app-id="wxbd08b4baa10fcc1d" extra-data='{{extraData}}' version="{{etcpVersion}}"> | <navigator bindfail="bindfail" path="pages/park/park" wx:if="{{canIUse}}" class='buy' target="miniProgram" open-type="navigate" app-id="wxbd08b4baa10fcc1d" extra-data='{{extraData}}' version="{{etcpVersion}}"> | ||||
立即支付 | 立即支付 | ||||
</navigator> | </navigator> | ||||
@@ -396,6 +396,9 @@ page { | |||||
position: relative; | position: relative; | ||||
height: 88rpx; | height: 88rpx; | ||||
margin-top: 30rpx; | margin-top: 30rpx; | ||||
display: flex; | |||||
justify-content: center; | |||||
align-items: center; | |||||
} | } | ||||
.buy { | .buy { | ||||
@@ -407,7 +410,7 @@ page { | |||||
font-size: 36rpx; | font-size: 36rpx; | ||||
line-height: 88rpx; | line-height: 88rpx; | ||||
border-radius: 60rpx; | border-radius: 60rpx; | ||||
position: relative; | |||||
position: absolute; | |||||
z-index: 100; | z-index: 100; | ||||
text-align: center; | text-align: center; | ||||
} | } | ||||