| @@ -135,7 +135,7 @@ var config = { | |||||
| }, | }, | ||||
| weapp: { | weapp: { | ||||
| AppId: "wxb11603577a84a86d" | |||||
| AppId: "wx8eb8275b78db4ede" | |||||
| }, | }, | ||||
| ErrorCode: { | ErrorCode: { | ||||
| NICK_NOT_AUTH: 11004, | NICK_NOT_AUTH: 11004, | ||||
| @@ -8,7 +8,7 @@ | |||||
| <view class="time">{{data.subTitle}}</view> | <view class="time">{{data.subTitle}}</view> | ||||
| <view class="money"> | <view class="money"> | ||||
| <text>¥{{data.salePrice/100}}</text> | <text>¥{{data.salePrice/100}}</text> | ||||
| <del>¥{{data.price/100}}</del> | |||||
| <del>{{data.price/100}}小时</del> | |||||
| <text wx:if="{{data.usePrice!=undefined}}" class="manjian">满{{data.usePrice/100}}元可用</text> | <text wx:if="{{data.usePrice!=undefined}}" class="manjian">满{{data.usePrice/100}}元可用</text> | ||||
| <text wx:if="{{data.usePrice==undefined}}" class="manjian">仅限本店使用</text> | <text wx:if="{{data.usePrice==undefined}}" class="manjian">仅限本店使用</text> | ||||
| </view> | </view> | ||||
| @@ -25,7 +25,7 @@ | |||||
| <text class="txt1">有效期至:</text> | <text class="txt1">有效期至:</text> | ||||
| <text class="txt2">{{item.expiredTime}}</text> | <text class="txt2">{{item.expiredTime}}</text> | ||||
| </view> | </view> | ||||
| <view wx:if="{{item.couponOrderStatus==0}}" class="btns" bindtap="gotouse" data-quancode="{{item.id}}">立即使用</view> | |||||
| <view wx:if="{{item.couponOrderStatus==0}}" class="btns" bindtap="gotouse" data-quancode="{{item.id}}">查看详情</view> | |||||
| <view wx:elif="{{item.couponOrderStatus==1||item.couponOrderStatus==2||item.couponOrderStatus==3}}" class="btns">查看</view> | <view wx:elif="{{item.couponOrderStatus==1||item.couponOrderStatus==2||item.couponOrderStatus==3}}" class="btns">查看</view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -10,6 +10,7 @@ Page({ | |||||
| addCar: null, | addCar: null, | ||||
| tcq: 2, | tcq: 2, | ||||
| flag: '', | flag: '', | ||||
| extraData:{} | |||||
| }, | }, | ||||
| /*车牌动态样式 */ | /*车牌动态样式 */ | ||||
| changeStyle: function () { | changeStyle: function () { | ||||
| @@ -26,6 +27,7 @@ Page({ | |||||
| var that = this | var that = this | ||||
| that.getList(); | that.getList(); | ||||
| }, | }, | ||||
| onShow: function (options) { | onShow: function (options) { | ||||
| var that = this; | var that = this; | ||||
| console.log("车牌号") | console.log("车牌号") | ||||
| @@ -82,7 +84,6 @@ Page({ | |||||
| for (let car of that.data.carList) { | for (let car of that.data.carList) { | ||||
| if (car.stopFee.parkingFee) { | if (car.stopFee.parkingFee) { | ||||
| that.data.payList.push(car) | that.data.payList.push(car) | ||||
| console.log('bbbb' + car); | |||||
| } | } | ||||
| } | } | ||||
| var etcpData = { | var etcpData = { | ||||
| @@ -249,11 +250,14 @@ Page({ | |||||
| /** | /** | ||||
| * 停车费用 | * 停车费用 | ||||
| */ | */ | ||||
| console.log(stopFee) | |||||
| that.setData({ | that.setData({ | ||||
| [stopFee]: res.data, | [stopFee]: res.data, | ||||
| [extraData]: extraDataStr | |||||
| }) | |||||
| [extraData]: extraDataStr, | |||||
| buttonBox: res.data.parkingFee | |||||
| }), | |||||
| console.log('res>>>' + JSON.stringify(that.data.buttonBox)) | |||||
| }) | }) | ||||
| .catch(error => { | .catch(error => { | ||||
| console.log(error) | console.log(error) | ||||
| @@ -27,7 +27,7 @@ | |||||
| <text>入场时间:{{item.stopFee.entranceTime}}</text> | <text>入场时间:{{item.stopFee.entranceTime}}</text> | ||||
| </view> | </view> | ||||
| <view class='priceBox right'> | <view class='priceBox right'> | ||||
| <text class="textRight">待缴金额:¥{{item.stopFee.parkingFee}}</text> | |||||
| <text class="textRight">停车费用:¥{{item.stopFee.parkingFee}}</text> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -47,7 +47,7 @@ | |||||
| <view class='voucher' wx:if="!{{tcq==1}}"> | <view class='voucher' wx:if="!{{tcq==1}}"> | ||||
| <text class='textV1 textV3'>{{item.title}}</text> | <text class='textV1 textV3'>{{item.title}}</text> | ||||
| <text class='textV2'>{{item.merchantName}}</text> | <text class='textV2'>{{item.merchantName}}</text> | ||||
| <text class='textV1'>{{'¥'+item.price/100}}</text> | |||||
| <text class='textV1'>{{'- '+item.price/100+'小时'}}</text> | |||||
| <view class='choice'> | <view class='choice'> | ||||
| <image src='../../assets/img/choiced.png'></image> | <image src='../../assets/img/choiced.png'></image> | ||||
| </view> | </view> | ||||
| @@ -61,8 +61,8 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view bindtap='bindCoupon' class="buy-view app-border-top"> | |||||
| <navigator class='buyBox' target="miniProgram" open-type="navigate" app-id="wx192b7d2e8dcbefd0" path="" extra-data='{{extraData}}' version="release"> | |||||
| <view bindtap='bindCoupon' class="buy-view app-border-top" wx:if="{{buttonBox}}"> | |||||
| <navigator wx:if="{{flag==1||flags=='alreadybind'}}" class='buyBox' target="miniProgram" open-type="navigate" app-id="wx192b7d2e8dcbefd0" path="" extra-data='{{extraData}}' version="trial"> | |||||
| </navigator> | </navigator> | ||||
| <button class='buy'>立即支付</button> | <button class='buy'>立即支付</button> | ||||
| </view> | </view> | ||||
| @@ -186,23 +186,23 @@ color: transparent; | |||||
| .textV1,.textV2{ | .textV1,.textV2{ | ||||
| height: 58rpx; | height: 58rpx; | ||||
| width: 100rpx; | width: 100rpx; | ||||
| padding-top: 22rpx; | |||||
| padding-top: 26rpx; | |||||
| text-align: center; | text-align: center; | ||||
| line-height: 80rxp; | line-height: 80rxp; | ||||
| font-size: 28rpx; | |||||
| font-size: 24rpx; | |||||
| color: #333; | color: #333; | ||||
| } | } | ||||
| .textV2{ | .textV2{ | ||||
| margin-top: -1rpx; | |||||
| margin-top: 0rpx; | |||||
| padding: 0; | padding: 0; | ||||
| /* background-color: rgb(0, 192, 255); */ | /* background-color: rgb(0, 192, 255); */ | ||||
| border-radius: 10rpx; | border-radius: 10rpx; | ||||
| width: 300rpx; | width: 300rpx; | ||||
| height: 80rpx; | height: 80rpx; | ||||
| line-height: 80rpx; | line-height: 80rpx; | ||||
| font-size: 28rpx; | |||||
| font-size: 20rpx; | |||||
| border: 4rpx #fff solid; | border: 4rpx #fff solid; | ||||
| margin-bottom: 22rpx; | |||||
| margin-bottom: 20rpx; | |||||
| } | } | ||||
| .textV3{ | .textV3{ | ||||
| width: 225rpx; | width: 225rpx; | ||||
| @@ -12,7 +12,7 @@ | |||||
| }, | }, | ||||
| "compileType": "miniprogram", | "compileType": "miniprogram", | ||||
| "libVersion": "2.2.5", | "libVersion": "2.2.5", | ||||
| "appid": "wxb11603577a84a86d", | |||||
| "appid": "wx8eb8275b78db4ede", | |||||
| "projectname": "%E5%AF%8C%E8%8C%82%E9%93%BE%E5%AE%A2", | "projectname": "%E5%AF%8C%E8%8C%82%E9%93%BE%E5%AE%A2", | ||||
| "isGameTourist": false, | "isGameTourist": false, | ||||
| "condition": { | "condition": { | ||||