tijiao
This commit is contained in:
@@ -237,35 +237,6 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="order_item" style="">
|
<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">
|
<view class="orderallpri">
|
||||||
<span style="color: #666; margin-right: 10rpx; float: left"
|
<span style="color: #666; margin-right: 10rpx; float: left"
|
||||||
>商品总价 :
|
>商品总价 :
|
||||||
@@ -322,13 +293,74 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="orderReal" v-if="orderContet.jfDeduction > 0">
|
<view class="orderReal" v-if="orderContet.jfDeduction > 0">
|
||||||
<span style="color: #666; margin-right: 10rpx; float: left"
|
<span style="color: #666; margin-right: 10rpx; float: left"
|
||||||
>积分 :
|
>积分抵扣:
|
||||||
</span>
|
</span>
|
||||||
<span style="color: #fa2d12" v-if="orderContet.jfDeduction > 0"
|
<span style="color: #fa2d12" v-if="orderContet.jfDeduction > 0"
|
||||||
>-</span
|
>- </span
|
||||||
>
|
>
|
||||||
<span style="color: #fa2d12"
|
<span style="color: #fa2d12"> {{ orderContet.jfDeduction }}</span>
|
||||||
>¥ {{ 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">- </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>
|
||||||
</view>
|
</view>
|
||||||
@@ -372,43 +404,6 @@
|
|||||||
orderContet.paymentDate
|
orderContet.paymentDate
|
||||||
}}</text>
|
}}</text>
|
||||||
</view>
|
</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"
|
|
||||||
> + 积分抵扣</text
|
|
||||||
>
|
|
||||||
</template>
|
|
||||||
<template v-else-if="orderContet.realMoney">
|
|
||||||
天医币支付
|
|
||||||
<text v-if="orderContet.jfDeduction > 0"
|
|
||||||
> + 积分抵扣</text
|
|
||||||
>
|
|
||||||
</template>
|
|
||||||
<template v-else-if="orderContet.jfDeduction > 0">
|
|
||||||
积分抵扣
|
|
||||||
</template>
|
|
||||||
</span></text
|
|
||||||
>
|
|
||||||
</view>
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- <view class="orderReal" v-if="orderContet.orderStatus >= 2 && orderContet.orderStatus != 5">
|
<!-- <view class="orderReal" v-if="orderContet.orderStatus >= 2 && orderContet.orderStatus != 5">
|
||||||
|
|||||||
673
unpackage/dist/dev/app-plus/app-service.js
vendored
673
unpackage/dist/dev/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
675
unpackage/dist/dev/app-plus/app-view.js
vendored
675
unpackage/dist/dev/app-plus/app-view.js
vendored
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user