This commit is contained in:
2025-04-16 16:15:54 +08:00
parent 8814cbc566
commit 0cdca5163e
3 changed files with 712 additions and 771 deletions

View File

@@ -237,35 +237,6 @@
</view>
<view class="order_item" style="">
<view
class="orderReal"
v-if="orderContet.orderStatus != 0"
style="margin-bottom: 20rpx"
>
<span style="color: #666; margin-right: 10rpx; float: left"
>实付款 :
</span>
<b v-if="orderContet.orderType == 'point'" style="color: #dd3c0c"
>¥ {{ orderContet.bookBuyConfigEntity.realMoney }}</b
>
<b style="color: #dd3c0c" v-else>
<template v-if="orderContet.realMoney > 0">
¥{{ orderContet.realMoney }}
</template>
<text
style="margin: 0 4rpx"
v-if="
orderContet.realMoney > 0 && orderContet.jfDeduction > 0
"
>
+
</text>
<text v-if="orderContet.jfDeduction > 0"
>{{ orderContet.jfDeduction }} 积分</text
></b
>
</view>
<view class="orderallpri">
<span style="color: #666; margin-right: 10rpx; float: left"
>商品总价 :
@@ -322,13 +293,74 @@
</view>
<view class="orderReal" v-if="orderContet.jfDeduction > 0">
<span style="color: #666; margin-right: 10rpx; float: left"
>积分 :
>积分抵扣:
</span>
<span style="color: #fa2d12" v-if="orderContet.jfDeduction > 0"
>-</span
>-&nbsp;&nbsp;</span
>
<span style="color: #fa2d12"
>¥ {{ orderContet.jfDeduction }}</span
<span style="color: #fa2d12"> {{ orderContet.jfDeduction }}</span>
</view>
<view
class="orderReal"
v-if="orderContet.paymentMethod == 4 && orderContet.realMoney > 0"
>
<span style="color: #666; margin-right: 10rpx; float: left"
>天医币抵扣:
</span>
<span style="color: #fa2d12">-&nbsp;&nbsp;</span>
<span style="color: #fa2d12">¥{{ orderContet.realMoney }}</span>
</view>
<view
class="orderReal"
v-if="orderContet.orderStatus != 0"
style="margin-bottom: 20rpx"
>
<span style="color: #666; margin-right: 10rpx; float: left"
>实付款 :
</span>
<b v-if="orderContet.orderType == 'point'" style="color: #dd3c0c"
>¥ {{ orderContet.bookBuyConfigEntity.realMoney }}</b
>
<b style="color: #dd3c0c" v-else>
<template v-if="orderContet.realMoney > 0">
¥{{ orderContet.realMoney }}
<text style="font-size: 24rpx;margin-left: 10rpx;">
<span
style=""
v-if="orderContet.paymentMethod == 1"
>微信支付</span
>
<span
style=""
v-if="orderContet.paymentMethod == 2"
>支付宝支付</span
>
<span
style=""
v-if="orderContet.paymentMethod == 3"
>苹果支付</span
>
<span
style=""
v-if="orderContet.paymentMethod == 4"
>
天医币支付
</span></text
>
</template>
<text
style="margin: 0 4rpx"
v-if="
orderContet.realMoney > 0 && orderContet.jfDeduction > 0
"
>
+
</text>
<text v-if="orderContet.jfDeduction > 0"
>{{ orderContet.jfDeduction }} 积分</text
></b
>
</view>
</view>
@@ -372,43 +404,6 @@
orderContet.paymentDate
}}</text>
</view>
<view class="orderReal" v-if="orderContet.paymentMethod">
<span style="color: #666; margin-right: 10rpx; float: left"
>付款方式 :
</span>
<text style="font-size: 24rpx; color: #666">
<span style="color: #666" v-if="orderContet.paymentMethod == 1"
>微信支付</span
>
<span style="color: #666" v-if="orderContet.paymentMethod == 2"
>支付宝支付</span
>
<span style="color: #666" v-if="orderContet.paymentMethod == 3"
>苹果支付</span
>
<span style="color: #666" v-if="orderContet.paymentMethod == 4">
<template
v-if="
orderContet.orderType == 'point' &&
orderContet.bookBuyConfigEntity.realMoney > 0
"
>
天医币支付<text v-if="orderContet.jfDeduction > 0"
>&nbsp;+ 积分抵扣</text
>
</template>
<template v-else-if="orderContet.realMoney">
天医币支付
<text v-if="orderContet.jfDeduction > 0"
>&nbsp;+ 积分抵扣</text
>
</template>
<template v-else-if="orderContet.jfDeduction > 0">
积分抵扣
</template>
</span></text
>
</view>
</view>
<!-- <view class="orderReal" v-if="orderContet.orderStatus >= 2 && orderContet.orderStatus != 5">

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff