|
@@ -39,7 +39,7 @@
|
|
<view class="flex align_center tejia-tag" v-if="detail.promoType=='PROMO_PROD'">
|
|
<view class="flex align_center tejia-tag" v-if="detail.promoType=='PROMO_PROD'">
|
|
特价<text>¥{{detail.orginPrice}}</text>
|
|
特价<text>¥{{detail.orginPrice}}</text>
|
|
</view>
|
|
</view>
|
|
- <view class="flex align_center tejia-tag" v-if="detail.shopProductSubsidy&&!detail.shopPromoProduct">
|
|
|
|
|
|
+ <view class="flex align_center rebate-tag" v-if="detail.shopProductSubsidy&&!detail.shopPromoProduct">
|
|
可抵扣<text>¥{{detail.shopProductSubsidy.subsidyAmount}}</text>
|
|
可抵扣<text>¥{{detail.shopProductSubsidy.subsidyAmount}}</text>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
@@ -192,7 +192,7 @@
|
|
</view>
|
|
</view>
|
|
<view class="flex align_center justify_between" v-if="detail.shopProductSubsidy">
|
|
<view class="flex align_center justify_between" v-if="detail.shopProductSubsidy">
|
|
<view>合计</view>
|
|
<view>合计</view>
|
|
- <view><text class="pf">¥</text>{{Number(totalAmount-detail.shopProductSubsidy.subsidyAmount).toFixed(2)}}</view>
|
|
|
|
|
|
+ <view><text class="pf">¥</text>{{Number(totalAmount-(hasKdk?detail.shopProductSubsidy.subsidyAmount:0)).toFixed(2)}}</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
<payOptions v-model="payType" :balance="storeAccount?storeAccount.rechargeBalance:0"></payOptions>
|
|
<payOptions v-model="payType" :balance="storeAccount?storeAccount.rechargeBalance:0"></payOptions>
|
|
@@ -207,7 +207,7 @@
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
<!-- 确认付款 -->
|
|
<!-- 确认付款 -->
|
|
- <view class="popu-content" v-if="payInfo&&showPay">
|
|
|
|
|
|
+ <view class="popu-content" v-if="payInfo&&showPay&&payData">
|
|
<view class="popu-close" @click="cancelPay">
|
|
<view class="popu-close" @click="cancelPay">
|
|
<uni-icons size="26" type="closeempty"></uni-icons>
|
|
<uni-icons size="26" type="closeempty"></uni-icons>
|
|
</view>
|
|
</view>
|
|
@@ -441,7 +441,7 @@
|
|
}
|
|
}
|
|
res.data.priceStr = Number(bprice).toFixed(2).toString().split('.')
|
|
res.data.priceStr = Number(bprice).toFixed(2).toString().split('.')
|
|
// 可抵扣金额小于抵扣金额且大于0
|
|
// 可抵扣金额小于抵扣金额且大于0
|
|
- const kdk = res.data.shopProductSubsidy.subsidyAmount>0&&res.data.shopProductSubsidy.subsidyAmount<this.storeAccount.giveBalance
|
|
|
|
|
|
+ const kdk = res.data.shopProductSubsidy&&res.data.shopProductSubsidy.subsidyAmount>0&&res.data.shopProductSubsidy.subsidyAmount<this.storeAccount.giveBalance
|
|
this.hasKdk = kdk
|
|
this.hasKdk = kdk
|
|
this.disKdk = !kdk
|
|
this.disKdk = !kdk
|
|
}
|
|
}
|