code-image-backup-public/lilishop-ui
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git synced 2025-12-18 17:05:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

合并master修改

Browse Source
This commit is contained in:
lemon橪
2021-08-27 18:11:52 +08:00
parent e6d8d87c31 bed539d16f
commit 5ac39d0e93
7 changed files with 162 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
seller/src/views/order/order/orderDetail.vue
View File

@@ -111,7 +111,7 @@
<div class="div-item-right">
{{ orderInfo.receipt.receiptStatus == 0 ? "未开" : "已开" }}
</div>
</div>
</div>
</template>
</Col>
<Col span="12">
@@ -217,15 +217,14 @@
orderInfo.order.priceDetailDTO.goodsPrice | unitPrice("￥")
}}</span>
</li>
<li>
<li v-if="orderInfo.order.priceDetailDTO.discountPrice && orderInfo.order.priceDetailDTO.discountPrice > 0">
<span class="label">优惠金额：</span>
<span class="txt">
{{
(orderInfo.order.priceDetailDTO.couponPrice +
orderInfo.order.priceDetailDTO.discountPrice)
| unitPrice("￥")
}}
</span>
<span class="txt"> {{ orderInfo.order.priceDetailDTO.discountPrice | unitPrice('￥') }} </span>
</li>
<li v-if="orderInfo.order.priceDetailDTO.couponPrice && orderInfo.order.priceDetailDTO.couponPrice > 0">
<span class="label">优惠券金额：</span>
<span class="txt"> {{ orderInfo.order.priceDetailDTO.couponPrice | unitPrice('￥') }} </span>
</li>
<li>
<span class="label">运费：</span>
@@ -619,13 +618,13 @@ export default {
key: "unitPrice",
minWidth: 100,
render: (h, params) => {
if (!params.row.priceDetailDTO.unitPrice) {
if (!params.row.unitPrice) {
return h("div", this.$options.filters.unitPrice(0, "￥"));
}
return h(
"div",
this.$options.filters.unitPrice(
params.row.priceDetailDTO.unitPrice,
params.row.unitPrice,
"￥"
)
);

2
seller/src/views/promotion/coupon/coupon.vue
View File

@@ -92,7 +92,7 @@ export default {
},
{
title: "领取数量/总数量",
title: "已领取数量/总数量",
key: "publishNum",
render: (h, params) => {
return h(