|
@@ -47,7 +47,7 @@
|
|
买{{item.conditionValue}}赠{{item.resultValue}}
|
|
买{{item.conditionValue}}赠{{item.resultValue}}
|
|
</view>
|
|
</view>
|
|
<view class="flex align_center tejia-tag" v-if="item.promoType=='PROMO_PROD'">
|
|
<view class="flex align_center tejia-tag" v-if="item.promoType=='PROMO_PROD'">
|
|
- 特价<text>¥{{item.orginPrice}}</text>
|
|
|
|
|
|
+ 特价<text>¥{{item.priceOrig}}</text>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
<view>
|
|
<view>
|
|
@@ -89,17 +89,17 @@
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
<view class="info" v-if="info">
|
|
<view class="info" v-if="info">
|
|
- <view class="infoList" v-if="info.totalTicketGiveAmount">
|
|
|
|
|
|
+ <view class="infoList gray-text" v-if="info.totalTicketGiveAmount">
|
|
<text>代金券</text>
|
|
<text>代金券</text>
|
|
- <text class="cText">¥{{info.totalTicketGiveAmount}}</text>
|
|
|
|
|
|
+ <text class="cText">¥{{Number(info.totalTicketGiveAmount).toFixed(2)}}</text>
|
|
</view>
|
|
</view>
|
|
- <view class="infoList" v-if="info.totalSpecialGiveAmount">
|
|
|
|
|
|
+ <view class="infoList gray-text" v-if="info.totalSpecialGiveAmount">
|
|
<text>总优惠</text>
|
|
<text>总优惠</text>
|
|
- <text class="cText">¥{{info.totalSpecialGiveAmount}}</text>
|
|
|
|
|
|
+ <text class="cText">¥{{Number(info.totalSpecialGiveAmount).toFixed(2)}}</text>
|
|
</view>
|
|
</view>
|
|
<view class="infoList">
|
|
<view class="infoList">
|
|
<text>总金额</text>
|
|
<text>总金额</text>
|
|
- <text class="redText">¥{{info.totalAmount}}</text>
|
|
|
|
|
|
+ <view class="price-txt">¥<text>{{Number(info.totalAmount).toFixed(2)}}</text></view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
<view class="info" v-if="info">
|
|
<view class="info" v-if="info">
|
|
@@ -217,18 +217,6 @@
|
|
item.discountType = a.discountType
|
|
item.discountType = a.discountType
|
|
item.promoProductSn = a.promoProductSn
|
|
item.promoProductSn = a.promoProductSn
|
|
item.promoSn = a.promoSn
|
|
item.promoSn = a.promoSn
|
|
- // 特价
|
|
|
|
- if(item.promoType=='PROMO_PROD'){
|
|
|
|
- item.orginPrice = item.price
|
|
|
|
- // 直降
|
|
|
|
- if(item.discountType == 'STRAIGHT_DOWN'){
|
|
|
|
- item.price = item.price - item.resultValue
|
|
|
|
- }
|
|
|
|
- // 折扣
|
|
|
|
- if(item.discountType == 'DISCOUNT'){
|
|
|
|
- item.price = Number(item.price * item.resultValue).toFixed(2)
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
// 满赠数量
|
|
// 满赠数量
|
|
item.giftQty = item.promoType=='BUY_PROD_GIVE_PROD' ? Math.floor(item.qty / item.conditionValue)*item.resultValue : 0
|
|
item.giftQty = item.promoType=='BUY_PROD_GIVE_PROD' ? Math.floor(item.qty / item.conditionValue)*item.resultValue : 0
|
|
}
|
|
}
|
|
@@ -311,9 +299,15 @@
|
|
}
|
|
}
|
|
.cText{
|
|
.cText{
|
|
color: #666;
|
|
color: #666;
|
|
- margin: 0 10rpx;
|
|
|
|
|
|
+ margin: 0 6rpx;
|
|
font-size: 14px;
|
|
font-size: 14px;
|
|
}
|
|
}
|
|
|
|
+ .gray-text{
|
|
|
|
+ text{
|
|
|
|
+ font-size: 14px;
|
|
|
|
+ color: #999;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
.order-body{
|
|
.order-body{
|
|
flex-grow: 1;
|
|
flex-grow: 1;
|
|
overflow: auto;
|
|
overflow: auto;
|
|
@@ -343,6 +337,15 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ .price-txt{
|
|
|
|
+ color: red;
|
|
|
|
+ display: flex;
|
|
|
|
+ align-items: baseline;
|
|
|
|
+ font-size: 12px;
|
|
|
|
+ text{
|
|
|
|
+ font-size: 32rpx;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
.info{
|
|
.info{
|
|
background-color: #FFFFFF;
|
|
background-color: #FFFFFF;
|
|
padding: 10rpx 30upx;
|
|
padding: 10rpx 30upx;
|
|
@@ -419,15 +422,6 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- .price-txt{
|
|
|
|
- color: red;
|
|
|
|
- display: flex;
|
|
|
|
- align-items: baseline;
|
|
|
|
- font-size: 12px;
|
|
|
|
- text{
|
|
|
|
- font-size: 32rpx;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
.rebate-tag{
|
|
.rebate-tag{
|
|
background: #ffe7df;
|
|
background: #ffe7df;
|
|
color: #E91E63;
|
|
color: #E91E63;
|