|
|
@@ -29,10 +29,10 @@
|
|
|
<view class="product-info">
|
|
|
<view class="pay-project-price fl">
|
|
|
<currency symbol="￥" value="{{item.price}}"/>
|
|
|
- <!-- <text wx:if="{{balanceInfo.total}}"> 或 {{item.price}}代金券</text>
|
|
|
- <text wx:if="{{balanceInfo.dc_total && item.mall_balance_price}}"> 或 {{item.mall_balance_price}}代金券</text> -->
|
|
|
+ <!-- <text wx:if="{{balanceInfo.total}}"> 或 {{item.price}}提货券</text>
|
|
|
+ <text wx:if="{{balanceInfo.dc_total && item.mall_balance_price}}"> 或 {{item.mall_balance_price}}提货券</text> -->
|
|
|
<!-- <currency symbol="￥" value="{{item.price}}" wx:if="{{curPayway==='weixinpay'}}"></currency>
|
|
|
- <text class="pay-gray" wx:if="{{curPayway==='balance'}}"> {{item.price}}代金券</text> -->
|
|
|
+ <text class="pay-gray" wx:if="{{curPayway==='balance'}}"> {{item.price}}提货券</text> -->
|
|
|
</view>
|
|
|
<view class="fr product-count">
|
|
|
x{{item.order_count}}
|
|
|
@@ -54,17 +54,17 @@
|
|
|
</view> -->
|
|
|
</view>
|
|
|
|
|
|
- <!-- 使用代金券兑换 -->
|
|
|
+ <!-- 使用提货券兑换 -->
|
|
|
<!-- <view class="pay-module">
|
|
|
- <text class="pay-title">代金券抵扣</text>
|
|
|
+ <text class="pay-title">提货券抵扣</text>
|
|
|
<view class="pay-integral fl">
|
|
|
<view class="pay-integral-info">
|
|
|
<view class="block pay-mb">可用
|
|
|
<text class="red">{{project.price * payData.count}}</text>
|
|
|
- 代金券抵扣<currency symbol="￥" value="{{project.price * payData.count}}" class="red"></currency>
|
|
|
+ 提货券抵扣<currency symbol="￥" value="{{project.price * payData.count}}" class="red"></currency>
|
|
|
</view>
|
|
|
- <view class="gray" wx:if="{{balanceInfo.total - project.price * payData.count >= 0}}">(抵扣后剩余{{balanceInfo.total - project.price * payData.count}}代金券)</view>
|
|
|
- <view class="red" wx:if="{{balanceInfo.total - project.price * payData.count < 0}}">(代金券不足以兑换)</view>
|
|
|
+ <view class="gray" wx:if="{{balanceInfo.total - project.price * payData.count >= 0}}">(抵扣后剩余{{balanceInfo.total - project.price * payData.count}}提货券)</view>
|
|
|
+ <view class="red" wx:if="{{balanceInfo.total - project.price * payData.count < 0}}">(提货券不足以兑换)</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="fr pay-checked">
|
|
|
@@ -95,10 +95,10 @@
|
|
|
<view class="pay-payway-item" wx:if="{{balanceInfo.total && !payData.product.robo_balance_price}}">
|
|
|
<view class="pay-payway-balance fl">
|
|
|
<image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/luobopay.jpg"></image>
|
|
|
- <text>代金券支付</text>
|
|
|
+ <text>提货券支付</text>
|
|
|
</view>
|
|
|
<view class="fr pay-balance-cash">
|
|
|
- <text>该商品不支持代金券支付</text>
|
|
|
+ <text>该商品不支持提货券支付</text>
|
|
|
</view>
|
|
|
<view class="clean"></view>
|
|
|
</view>
|
|
|
@@ -106,7 +106,7 @@
|
|
|
<view class="pay-payway-item" wx:if="{{payData.order_type == 0 && balanceInfo.total && payData.pay_way == ''}}">
|
|
|
<view class="pay-payway-balance fl">
|
|
|
<image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/luobopay.jpg" bindtap="selectClick" data-payway="balance"></image>
|
|
|
- <text bindtap="selectClick" data-payway="balance">代金券抵扣 （剩余：{{balanceInfo.total / 100}}）</text>
|
|
|
+ <text bindtap="selectClick" data-payway="balance">提货券抵扣 （剩余：{{balanceInfo.total / 100}}）</text>
|
|
|
</view>
|
|
|
<view class="fr pay-balance-cash">
|
|
|
<switch checked bindchange="switchChange" color="#eab86a" style="zoom:0.75"/>
|
|
|
@@ -128,10 +128,10 @@
|
|
|
<view class="pay-payway-item" wx:if="{{payData.order_type == 0 && balanceInfo.total}}" bindtap="selectClick" data-payway="balance">
|
|
|
<view class="pay-payway-balance fl">
|
|
|
<image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/luobopay.jpg" bindtap="selectClick" data-payway="balance"></image>
|
|
|
- <text bindtap="selectClick" data-payway="balance">代金券支付</text>
|
|
|
+ <text bindtap="selectClick" data-payway="balance">提货券支付</text>
|
|
|
</view>
|
|
|
<view class="fr pay-balance-cash" bindtap="selectClick" data-payway="balance">
|
|
|
- <text bindtap="selectClick" data-payway="balance">剩余：{{balanceInfo.total / 100}}代金券</text>
|
|
|
+ <text bindtap="selectClick" data-payway="balance">剩余：{{balanceInfo.total / 100}}提货券</text>
|
|
|
<text class="pay-circle" bindtap="selectClick" data-payway="balance">
|
|
|
<text class="pay-select" wx:if="{{curPayway === 'balance'}}"></text>
|
|
|
</text>
|
|
|
@@ -142,10 +142,10 @@
|
|
|
<view class="pay-payway-item" wx:if="{{balanceInfo.dc_total && !payData.product.mall_balance_price}}">
|
|
|
<view class="pay-payway-balance fl">
|
|
|
<image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/d5cpay.jpg"></image>
|
|
|
- <text>第五创代金券</text>
|
|
|
+ <text>第五创提货券</text>
|
|
|
</view>
|
|
|
<view class="fr pay-balance-cash">
|
|
|
- <text>该商品不支持代金券支付</text>
|
|
|
+ <text>该商品不支持提货券支付</text>
|
|
|
</view>
|
|
|
<view class="clean"></view>
|
|
|
</view>
|
|
|
@@ -153,10 +153,10 @@
|
|
|
<view class="pay-payway-item" wx:if="{{balanceInfo.dc_total && payData.product.mall_balance_price}}" bindtap="selectClick" data-payway="integral">
|
|
|
<view class="pay-payway-balance fl">
|
|
|
<image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/d5cpay.jpg" bindtap="selectClick" data-payway="integral"></image>
|
|
|
- <text bindtap="selectClick" data-payway="integral">第五创代金券</text>
|
|
|
+ <text bindtap="selectClick" data-payway="integral">第五创提货券</text>
|
|
|
</view>
|
|
|
<view class="fr pay-balance-cash" bindtap="selectClick" data-payway="integral">
|
|
|
- <text bindtap="selectClick" data-payway="integral">剩余：{{balanceInfo.dc_total}}代金券</text>
|
|
|
+ <text bindtap="selectClick" data-payway="integral">剩余：{{balanceInfo.dc_total}}提货券</text>
|
|
|
<text class="pay-circle" bindtap="selectClick" data-payway="integral">
|
|
|
<text class="pay-select" wx:if="{{curPayway === 'integral'}}"></text>
|
|
|
</text>
|
|
|
@@ -184,7 +184,7 @@
|
|
|
</view>
|
|
|
|
|
|
<view wx:if="{{useBalance || payData.coupon_price>0}}" style="padding:15rpx;text-align:right">
|
|
|
- 使用代金券抵扣 <text style="color:#F00">-{{payData.coupon_price>0?payData.coupon_price/100:balanceInfo.total - total+yunfei >= 0 ? (total+yunfei) / 100 : balanceInfo.total / 100}}</text> 代金券
|
|
|
+ 使用提货券抵扣 <text style="color:#F00">-{{payData.coupon_price>0?payData.coupon_price/100:balanceInfo.total - total+yunfei >= 0 ? (total+yunfei) / 100 : balanceInfo.total / 100}}</text> 提货券
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -205,8 +205,8 @@
|
|
|
<currency wx:if="{{useBalance}}" symbol="￥" value="{{afterdec}}" class="red"></currency>
|
|
|
<currency wx:else symbol="￥" value="{{payData.pay_way == '' ? total+yunfei : payData.paied_price}}" class="red"></currency>
|
|
|
|
|
|
- <text class="red" wx:if="{{curPayway === 'balance'}}">{{(total+yunfei) / 100}}<currency value="{{total}}" class="red"></currency>代金券</text>
|
|
|
- <text class="red" wx:if="{{curPayway === 'integral'}}">{{(total+yunfei) / 100}}代金券</text>
|
|
|
+ <text class="red" wx:if="{{curPayway === 'balance'}}">{{(total+yunfei) / 100}}<currency value="{{total}}" class="red"></currency>提货券</text>
|
|
|
+ <text class="red" wx:if="{{curPayway === 'integral'}}">{{(total+yunfei) / 100}}提货券</text>
|
|
|
</view>
|
|
|
|
|
|
</view>
|
|
|
@@ -241,13 +241,13 @@
|
|
|
<image wx:if="{{curPayway === 'balance'}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/icon/luobo.png" style="width:120rpx;height:120rpx;margin:0 auto;display:block;"></image>
|
|
|
<image wx:if="{{curPayway === 'integral'}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/d5cpay.jpg" style="width:120rpx;height:120rpx;margin:0 auto;display:block;border-radius: 50%;"></image>
|
|
|
</view>
|
|
|
- <view class="modal-span">还差<text class="modal-count">{{luoboCount}}</text><text wx:if="{{curPayway === 'balance'}}">代金券</text><text wx:if="{{curPayway === 'integral'}}">代金券</text></view>
|
|
|
+ <view class="modal-span">还差<text class="modal-count">{{luoboCount}}</text><text wx:if="{{curPayway === 'balance'}}">提货券</text><text wx:if="{{curPayway === 'integral'}}">提货券</text></view>
|
|
|
<view class="modal-span1">您可通过如下操作<text wx:if="{{curPayway === 'balance'}}">完成兑换</text></view>
|
|
|
</view>
|
|
|
<view class="modal-footer1">
|
|
|
- <view class="btn-confirm" bindtap="onConfirm" data-status="confirm" wx:if="{{curPayway === 'balance'}}">前往代金券兑换代金券</view>
|
|
|
- <view class="btn-confirm" bindtap="onConfirm1" data-status="confirm" wx:if="{{curPayway === 'balance'}}">购买代金券( {{countMoney}} )元</view>
|
|
|
- <view class="btn-confirm" bindtap="onConfirm2" data-status="confirm" wx:if="{{curPayway === 'integral'}}">获取更多第五创代金券</view>
|
|
|
+ <view class="btn-confirm" bindtap="onConfirm" data-status="confirm" wx:if="{{curPayway === 'balance'}}">前往提货券兑换提货券</view>
|
|
|
+ <view class="btn-confirm" bindtap="onConfirm1" data-status="confirm" wx:if="{{curPayway === 'balance'}}">购买提货券( {{countMoney}} )元</view>
|
|
|
+ <view class="btn-confirm" bindtap="onConfirm2" data-status="confirm" wx:if="{{curPayway === 'integral'}}">获取更多第五创提货券</view>
|
|
|
<view class="btn-cancel" bindtap="onCancel" data-status="cancel">取消</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -255,12 +255,12 @@
|
|
|
<!--
|
|
|
<view class="modal-mask" bindtap="hideModal" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view>
|
|
|
<view class="modal-dialog" wx:if="{{showModal}}">
|
|
|
- <view class="modal-title">代金券不足</view>
|
|
|
+ <view class="modal-title">提货券不足</view>
|
|
|
<view class="modal-content">
|
|
|
<view>
|
|
|
<image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/icon/luobo.png" style="width:215rpx;height:215rpx;margin:0 auto;display:block;"></image>
|
|
|
</view>
|
|
|
- <view class="modal-span">立即前往汇兑页获取代金券</view>
|
|
|
+ <view class="modal-span">立即前往汇兑页获取提货券</view>
|
|
|
</view>
|
|
|
<view class="modal-footer">
|
|
|
<view class="btn-cancel" bindtap="onCancel" data-status="cancel">取消</view>
|
