|
@@ -31,10 +31,10 @@
|
|
<view class="empty-bar" v-if="total==0 && status!='loading'" @click="goBack">
|
|
<view class="empty-bar" v-if="total==0 && status!='loading'" @click="goBack">
|
|
<view>{{empty.tip}}</view>
|
|
<view>{{empty.tip}}</view>
|
|
</view>
|
|
</view>
|
|
- <!-- 商品总计 -->
|
|
|
|
|
|
+ <!-- 商品总计,优惠金额、代金券,抵扣至少有一个时显示 -->
|
|
<view class="product-price">
|
|
<view class="product-price">
|
|
<view>
|
|
<view>
|
|
- <view class="product-price-item">
|
|
|
|
|
|
+ <view class="product-price-item" v-if="totalDiscount||totalCoupon||subsidyAmount">
|
|
<text>总金额</text>
|
|
<text>总金额</text>
|
|
<text class="price">¥{{Number(totalAmount).toFixed(2)}}</text>
|
|
<text class="price">¥{{Number(totalAmount).toFixed(2)}}</text>
|
|
</view>
|
|
</view>
|
|
@@ -244,7 +244,8 @@
|
|
price:item.orginPrice,
|
|
price:item.orginPrice,
|
|
promoSn: item.promoSn,
|
|
promoSn: item.promoSn,
|
|
promoProductSn: item.shopProductSubsidy&&item.shopProductSubsidy.productSubsidySn,
|
|
promoProductSn: item.shopProductSubsidy&&item.shopProductSubsidy.productSubsidySn,
|
|
- resultValue: item.shopProductSubsidy&&item.shopProductSubsidy.subsidyAmount
|
|
|
|
|
|
+ resultValue: item.shopProductSubsidy&&item.shopProductSubsidy.subsidyAmount,
|
|
|
|
+ useSubsidyFlag: this.hasKdk? '1' : '0'
|
|
})
|
|
})
|
|
cartSn.push({
|
|
cartSn.push({
|
|
cartSn: item.cartSn,
|
|
cartSn: item.cartSn,
|
|
@@ -254,7 +255,7 @@
|
|
})
|
|
})
|
|
|
|
|
|
// 校验并提示信息
|
|
// 校验并提示信息
|
|
- purchaseCheck({detailList:detailList}).then(res => {
|
|
|
|
|
|
+ purchaseCheck({detailList:detailList,useSubsidyFlag: this.hasKdk? '1' : '0'}).then(res => {
|
|
if(res.status == 200){
|
|
if(res.status == 200){
|
|
const promoChangeFlag = res.data.promoChangeFlag
|
|
const promoChangeFlag = res.data.promoChangeFlag
|
|
// 活动变更
|
|
// 活动变更
|
|
@@ -322,6 +323,7 @@
|
|
this.loading = true
|
|
this.loading = true
|
|
purchaseSave({
|
|
purchaseSave({
|
|
detailList: detailList,
|
|
detailList: detailList,
|
|
|
|
+ useSubsidyFlag: this.hasKdk? '1' : '0',
|
|
payOnlineType: this.payType == 0 ? 'RECHARGE_BALANCE' : this.payType == 1 ? 'PAY_WECHAT_ONLINE' : ''
|
|
payOnlineType: this.payType == 0 ? 'RECHARGE_BALANCE' : this.payType == 1 ? 'PAY_WECHAT_ONLINE' : ''
|
|
}).then(res => {
|
|
}).then(res => {
|
|
this.loading = false
|
|
this.loading = false
|