| @@ -16,9 +16,13 @@ | |||||
| } | } | ||||
| ], | ], | ||||
| "configUrl": "https://ctest.malls.iformall.com/C/api", | "configUrl": "https://ctest.malls.iformall.com/C/api", | ||||
| "etcpAppId": "wx192b7d2e8dcbefd0", | |||||
| "etcpVersion": "release", | |||||
| "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", | |||||
| "car": { | |||||
| "etcp": { | |||||
| "etcpAppId": "wx192b7d2e8dcbefd0", | |||||
| "etcpVersion": "release", | |||||
| "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" | |||||
| } | |||||
| }, | |||||
| "ifHaveWebSocket": "0", | "ifHaveWebSocket": "0", | ||||
| "ifHaveCarModular": "1" | "ifHaveCarModular": "1" | ||||
| }, | }, | ||||
| @@ -50,7 +50,9 @@ Page({ | |||||
| quanid: '', | quanid: '', | ||||
| gouHr: imgurl.gouHr.url, | gouHr: imgurl.gouHr.url, | ||||
| totalTicketNum: 0, | totalTicketNum: 0, | ||||
| remark:'', | |||||
| generalPayPath:'', | |||||
| generalExtraData:{}, | |||||
| }, | }, | ||||
| getMoreList(e) { | getMoreList(e) { | ||||
| let totalNum = this.data.ticketList.length; | let totalNum = this.data.ticketList.length; | ||||
| @@ -848,6 +850,31 @@ Page({ | |||||
| }, | }, | ||||
| timecha: res.data.duration | timecha: res.data.duration | ||||
| }); | }); | ||||
| }else{ | |||||
| // var extraDataStr = { | |||||
| // params: { | |||||
| // token: app.globalData.etcpToken, | |||||
| // syncId: res.data.orderId, | |||||
| // payType: 6, // 小程序支付 | |||||
| // CarNumber: carNumber, | |||||
| // returnUrl: that.data.etcpCallbackUrl, | |||||
| // source: "FUMAO-001", | |||||
| // actionId: "1",//操作ID,1:小程序支付 | |||||
| // }, | |||||
| // } | |||||
| that.setData({ | |||||
| parkVendor: app.globalData.parkVendor, | |||||
| // extraData: extraDataStr, | |||||
| stopFees: res.data, | |||||
| timecha: Util.timecha(res.data.exitTime, res.data.entranceTime), | |||||
| remark: res.data.remark, | |||||
| generalAppId:res.data.appId, | |||||
| generalPayPath: res.data.payPath, | |||||
| generalExtraData: res.data.extraData, | |||||
| extraDataFlag: JSON.stringify(res.data.extraData) | |||||
| }); | |||||
| console.log( that.data.extraDataFlag,"123456789") | |||||
| } | } | ||||
| that.setData({ | that.setData({ | ||||
| @@ -1,4 +1,4 @@ | |||||
| <navbar text="停车"></navbar> | |||||
| <navbar text="停车"></navbar> | |||||
| <view style="height:{{navigationBarHeight}} "></view> | <view style="height:{{navigationBarHeight}} "></view> | ||||
| <view class='container' wx:if="{{ifHaveCarModular == 1}}" > | <view class='container' wx:if="{{ifHaveCarModular == 1}}" > | ||||
| <view class='top'> | <view class='top'> | ||||
| @@ -46,6 +46,10 @@ | |||||
| <text class="fl">待缴费用:</text> | <text class="fl">待缴费用:</text> | ||||
| <text class='fr' style='color:#ff4949;'>{{stopFees.remainingFee}}元</text> | <text class='fr' style='color:#ff4949;'>{{stopFees.remainingFee}}元</text> | ||||
| </view> | </view> | ||||
| <view class="clearfix" wx:if="{{remark}}"> | |||||
| <text class="fl">备注:</text> | |||||
| <text class='fr time' >{{remark}}</text> | |||||
| </view> | |||||
| <!-- 停车费用大于0 etcp --> | <!-- 停车费用大于0 etcp --> | ||||
| <view class="buy-view" wx:if="{{stopFees.orderId&&stopFees.remainingFee>0&&parkVendor==1}}"> | <view class="buy-view" wx:if="{{stopFees.orderId&&stopFees.remainingFee>0&&parkVendor==1}}"> | ||||
| <navigator bindfail="bindfail" path="{{payPath}}" wx:if="{{canIUse}}" class='buy' target="miniProgram" open-type="navigate" app-id="{{etcpAppId}}" extra-data='{{extraData}}' version="{{carMiniVersion}}"> | <navigator bindfail="bindfail" path="{{payPath}}" wx:if="{{canIUse}}" class='buy' target="miniProgram" open-type="navigate" app-id="{{etcpAppId}}" extra-data='{{extraData}}' version="{{carMiniVersion}}"> | ||||
| @@ -67,6 +71,20 @@ | |||||
| </navigator> | </navigator> | ||||
| <view wx:if="{{!canIUse}}" class='buy' data-flag="parkVendor5" bindtap='gotoCarMini'>立即支付</view> | <view wx:if="{{!canIUse}}" class='buy' data-flag="parkVendor5" bindtap='gotoCarMini'>立即支付</view> | ||||
| </view> | </view> | ||||
| <!-- 通用停车 --> | |||||
| <view class="buy-view" wx:if="{{stopFees.orderId&&stopFees.remainingFee>0&&parkVendor!=1&&parkVendor!=2&&parkVendor!=3&&parkVendor!=4&&parkVendor!=5&&extraDataFlag!='{}'}}"> | |||||
| <navigator bindfail="bindfail" path="{{generalPayPath}}" wx:if="{{canIUse}}" class='buy' target="miniProgram" open-type="navigate" app-id="{{generalAppId}}" extra-data='{{generalExtraData}}' version="{{carMiniVersion}}"> | |||||
| 立即支付 | |||||
| </navigator> | |||||
| <view wx:if="{{!canIUse}}" class='buy' data-flag="parkVendor1" bindtap='gotoCarMini'>立即支付</view> | |||||
| </view> | |||||
| <view class="buy-view" wx:if="{{stopFees.orderId&&stopFees.remainingFee>0&&parkVendor!=1&&parkVendor!=2&&parkVendor!=3&&parkVendor!=4&&parkVendor!=5&&extraDataFlag=='{}'}}"> | |||||
| <navigator bindfail="bindfail" path="{{generalPayPath}}" wx:if="{{canIUse}}" class='buy' target="miniProgram" open-type="navigate" app-id="{{generalAppId}}" version="{{carMiniVersion}}"> | |||||
| 立即支付 | |||||
| </navigator> | |||||
| <view wx:if="{{!canIUse}}" class='buy' data-flag="parkVendor1" bindtap='gotoCarMini'>立即支付</view> | |||||
| </view> | |||||
| <!-- 停车费用为0 --> | <!-- 停车费用为0 --> | ||||
| <view wx:if="{{stopFees.remainingFee==0}}" class='buy' bindtap='paySuccess'>立即支付</view> | <view wx:if="{{stopFees.remainingFee==0}}" class='buy' bindtap='paySuccess'>立即支付</view> | ||||
| </view> | </view> | ||||
| @@ -6,7 +6,7 @@ | |||||
| <view> | <view> | ||||
| <view class='under_line'></view> | <view class='under_line'></view> | ||||
| <view style='float: left' class='left'> | <view style='float: left' class='left'> | ||||
| <scroll-view scroll-y scroll-with-animation scroll-left="{{scrollLength}}" class='scrollY' style='height: {{windowHeight-navigationBarHeight-160}}px;top:240rpx;'> | |||||
| <scroll-view scroll-y scroll-with-animation scroll-left="{{scrollLength}}" class='scrollY' style='height: {{windowHeight-navigationBarHeight-160}}px;'> | |||||
| <view class='all clear'> | <view class='all clear'> | ||||
| <block wx:for="{{lists}}" wx:key="{{index}}"> | <block wx:for="{{lists}}" wx:key="{{index}}"> | ||||
| <view bindtap='jumpIndex' data-menuindex='{{item.id}}'> | <view bindtap='jumpIndex' data-menuindex='{{item.id}}'> | ||||
| @@ -25,7 +25,10 @@ | |||||
| position: fixed; | position: fixed; | ||||
| left: 0; | left: 0; | ||||
| background:#F4F5F9; | background:#F4F5F9; | ||||
| /* top:240rpx; */ | |||||
| margin-top: 40rpx; | |||||
| } | } | ||||
| .text-style { | .text-style { | ||||
| position: relative; | position: relative; | ||||
| @@ -1,4 +1,5 @@ | |||||
| <navbar back home text="添加车辆"></navbar> | <navbar back home text="添加车辆"></navbar> | ||||
| <view style="height:{{navigationBarHeight}} "></view> | |||||
| <view class="addpark-title" >请输入车牌号(新能源选填)</view> | <view class="addpark-title" >请输入车牌号(新能源选填)</view> | ||||
| <view class="addpark-num" capture-bind:touchstart="handleTap"> | <view class="addpark-num" capture-bind:touchstart="handleTap"> | ||||
| <view class="addpark-num-head"> | <view class="addpark-num-head"> | ||||
| @@ -1,4 +1,5 @@ | |||||
| <navbar back home text="车辆管理"></navbar> | <navbar back home text="车辆管理"></navbar> | ||||
| <view style="height:{{navigationBarHeight}} "></view> | |||||
| <view class='title' >30天内最多绑定4次车牌<text class='rem'>解绑前请确认车已经离场</text></view> | <view class='title' >30天内最多绑定4次车牌<text class='rem'>解绑前请确认车已经离场</text></view> | ||||
| <!-- 车牌 --> | <!-- 车牌 --> | ||||
| <!-- 有车牌的时候显示 --> | <!-- 有车牌的时候显示 --> | ||||