Commit 4d84cc0b by 谢中龙

抵用券优惠之后金额为负数

parent 2029db4c
...@@ -4,10 +4,8 @@ ...@@ -4,10 +4,8 @@
<view class="page-confirm-order"> <view class="page-confirm-order">
<!-- 选择方式 --> <!-- 选择方式 -->
<view class="deliveryType" wx:if="{{isOpenSelfMention}}"> <view class="deliveryType" wx:if="{{isOpenSelfMention}}">
<view class="de-type-item {{currentType == 'delivery' ? 'active' : ''}}" <view class="de-type-item {{currentType == 'delivery' ? 'active' : ''}}" data-type="delivery" bindtap="onTapChangeType">快递配送</view>
data-type="delivery" bindtap="onTapChangeType">快递配送</view> <view class="de-type-item {{currentType == 'selfPickUp' ? 'active' : ''}}" data-type="selfPickUp" bindtap="onTapChangeType">门店自提</view>
<view class="de-type-item {{currentType == 'selfPickUp' ? 'active' : ''}}"
data-type="selfPickUp" bindtap="onTapChangeType">门店自提</view>
</view> </view>
<form> <form>
...@@ -15,55 +13,29 @@ ...@@ -15,55 +13,29 @@
<view class="address-wrap" wx:if="{{currentType == 'delivery'}}"> <view class="address-wrap" wx:if="{{currentType == 'delivery'}}">
<block wx:if="{{goodsAddress}}"> <block wx:if="{{goodsAddress}}">
<view class="address-section"> <view class="address-section">
<input class="address-input" name="name" <input class="address-input" name="name" data-name="name" value='{{uAddress.name}}' bindinput='onInput' placeholder="请输入收货人姓名" />
data-name="name" value='{{uAddress.name}}' <input class="address-input" name="phone" data-name="phone" bindinput='onInput' value='{{uAddress.phone}}' placeholder="请输入手机号码" />
bindinput='onInput'
placeholder="请输入收货人姓名" />
<input class="address-input" name="phone"
data-name="phone"
bindinput='onInput'
value='{{uAddress.phone}}'
placeholder="请输入手机号码" />
</view> </view>
<view class="address-section"> <view class="address-section">
<picker <picker class="address-input address-picker" mode="multiSelector" bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{citys}}">
class="address-input address-picker"
mode="multiSelector"
bindchange="bindMultiPickerChange"
bindcolumnchange="bindMultiPickerColumnChange"
value="{{multiIndex}}"
range="{{citys}}"
>
<view class="form-picker" style="padding-top: 8rpx;" wx:if="{{cityView}}"> <view class="form-picker" style="padding-top: 8rpx;" wx:if="{{cityView}}">
{{cityView}} {{cityView}}
</view> </view>
<view wx:if="{{!cityView}}"> <view wx:if="{{!cityView}}">
<input <input class='form-input' placeholder-class="placeholder-picker" style="padding-top: 8rpx;" type="text" disabled placeholder="所在区域" />
class='form-input'
placeholder-class="placeholder-picker"
style="padding-top: 8rpx;"
type="text"
disabled
placeholder="所在区域"
/>
</view> </view>
</picker> </picker>
</view> </view>
<view class="address-section"> <view class="address-section">
<input class="address-input address-detail" <input class="address-input address-detail" name="address" bindinput='onInput' data-name="address" value='{{uAddress.address}}' placeholder="请输入路名门牌号" />
name="address"
bindinput='onInput'
data-name="address"
value='{{uAddress.address}}'
placeholder="请输入路名门牌号" />
</view> </view>
</block> </block>
<block wx:if="{{!goodsAddress}}"> <block wx:if="{{!goodsAddress}}">
<view class="address-list" bindtap="selectAddress"> <view class="address-list" bindtap="selectAddress">
<view class="address-info"> <view class="address-info">
<view> <view>
<image class="defalut-add-img" <image class="defalut-add-img" src="{{addressInfo.type == 1 ? 'https://img3.bigaka.com/prd/3001/202003/20200309/3001f7a6186d-6882-422c-a77c-61b8291c091a.png' : 'https://img3.bigaka.com/prd/3001/202003/20200309/300129705d0a-bf5c-4b2f-aedd-0c3fc9f78ba1.png'}}"
src="{{addressInfo.type == 1 ? 'https://img3.bigaka.com/prd/3001/202003/20200309/3001f7a6186d-6882-422c-a77c-61b8291c091a.png' : 'https://img3.bigaka.com/prd/3001/202003/20200309/300129705d0a-bf5c-4b2f-aedd-0c3fc9f78ba1.png'}}" /> />
<text class="user-name">{{addressInfo.name}}</text> <text class="user-name">{{addressInfo.name}}</text>
<text class="phone-number">{{addressInfo.phone}}</text> <text class="phone-number">{{addressInfo.phone}}</text>
</view> </view>
...@@ -133,8 +105,7 @@ ...@@ -133,8 +105,7 @@
<view class="vip-info" wx:if="{{!isVip && plusIsOpen}}"> <view class="vip-info" wx:if="{{!isVip && plusIsOpen}}">
<view class="vip-left"> <view class="vip-left">
<view class="left-top"> <view class="left-top">
<image class="top-image" <image class="top-image" src="https://img3.bigaka.com/prd/3001/202003/20200309/3001a3933408-de10-4029-861f-f8fb5de26092.png" />
src="https://img3.bigaka.com/prd/3001/202003/20200309/3001a3933408-de10-4029-861f-f8fb5de26092.png" />
<text>现在勾选成为vip,享受更多优惠</text> <text>现在勾选成为vip,享受更多优惠</text>
</view> </view>
<view class="left-bottom"> <view class="left-bottom">
...@@ -147,7 +118,8 @@ ...@@ -147,7 +118,8 @@
<image class="check-status-img" src="{{isSelect ? '/assets/imgs/7_1_0/08_22/trade-success.png' : '/assets/imgs/7_1_0/08_22/trade-unsel.png'}}" /> <image class="check-status-img" src="{{isSelect ? '/assets/imgs/7_1_0/08_22/trade-success.png' : '/assets/imgs/7_1_0/08_22/trade-unsel.png'}}" />
</view> </view>
<view class="right-check-tips {{isSelect? 'tip-check' : 'tip-un-check'}}"> <view class="right-check-tips {{isSelect? 'tip-check' : 'tip-un-check'}}">
<image class="select-check-open {{isSelect? 'tip-check' : 'tip-un-check'}}" src="{{isSelect ? 'https://img3.bigaka.com/prd/3001/202003/20200309/3001ab6df057-e550-446c-a641-c5dcd8dbb51e.png' : 'https://img3.bigaka.com/prd/3001/202003/20200309/3001e6e3414a-3f8e-4100-b9da-7f852d842235.png'}}" /> <image class="select-check-open {{isSelect? 'tip-check' : 'tip-un-check'}}" src="{{isSelect ? 'https://img3.bigaka.com/prd/3001/202003/20200309/3001ab6df057-e550-446c-a641-c5dcd8dbb51e.png' : 'https://img3.bigaka.com/prd/3001/202003/20200309/3001e6e3414a-3f8e-4100-b9da-7f852d842235.png'}}"
/>
</view> </view>
</view> </view>
</view> </view>
...@@ -175,7 +147,7 @@ ...@@ -175,7 +147,7 @@
<!-- class='coupon-items' --> <!-- class='coupon-items' -->
<view bindtap="selectCoupon"> <view bindtap="selectCoupon">
<text class="price-label">优惠券</text> <text class="price-label">优惠券</text>
<view class="select-coupon" > <view class="select-coupon">
<text class="{{defalutCoupon ? 'coupon-price' : 'no-coupon'}}">{{defalutCoupon ? (currentCoupon ? '-' + currentCoupon : '-' + defalutCoupon): (currentOrderList.couponDiscountPreviews.length == 0 ? '无可使用优惠券' : '选择优惠券')}}</text> <text class="{{defalutCoupon ? 'coupon-price' : 'no-coupon'}}">{{defalutCoupon ? (currentCoupon ? '-' + currentCoupon : '-' + defalutCoupon): (currentOrderList.couponDiscountPreviews.length == 0 ? '无可使用优惠券' : '选择优惠券')}}</text>
<image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" /> <image class="arrow-right" src="/assets/imgs/7_1_0/arrow-right.png" />
</view> </view>
...@@ -262,9 +234,5 @@ ...@@ -262,9 +234,5 @@
</view> </view>
<!--goHome--> <!--goHome-->
<go-home/> <go-home/>
<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage"/> <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage" />
<select-coupon <select-coupon show="{{showSelectCoupon}}" bind:updateCoupon="updateCoupon" coupon-list="{{couponDiscountPreviews}}" />
show="{{showSelectCoupon}}" \ No newline at end of file
bind:updateCoupon="updateCoupon"
coupon-list="{{couponDiscountPreviews}}"/>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment