From 45078230c489149ce2d61b36b306026a9539d8a7 Mon Sep 17 00:00:00 2001 From: ninaSun Date: Fri, 31 May 2024 11:23:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=9A=E6=8A=98=E6=89=A3?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/checkout/-checkout-inventory.vue | 2 ++ buyer/src/views/checkout/-checkout-total.vue | 5 ++++ buyer/src/views/member/index.vue | 27 +++++++++++++++++++ buyer/src/views/member/my-order/detail.vue | 1 + .../settlement-manage/settlementDetail.vue | 8 ++++++ .../src/views/order/settlementDetail.vue | 13 +++++++-- 6 files changed, 54 insertions(+), 2 deletions(-) diff --git a/buyer/src/views/checkout/-checkout-inventory.vue b/buyer/src/views/checkout/-checkout-inventory.vue index ff7b4c8..630d650 100644 --- a/buyer/src/views/checkout/-checkout-inventory.vue +++ b/buyer/src/views/checkout/-checkout-inventory.vue @@ -41,6 +41,8 @@
优惠折扣： -￥{{ shop.price.discount_price | unitPrice }}
+
会员折扣： -￥{{ shop.price.member_level_discount_price | unitPrice }} +
店铺合计（含运费）： ￥{{ shop.price.total_price | unitPrice }}
diff --git a/buyer/src/views/checkout/-checkout-total.vue b/buyer/src/views/checkout/-checkout-total.vue index 4dc0a16..0d9871e 100644 --- a/buyer/src/views/checkout/-checkout-total.vue +++ b/buyer/src/views/checkout/-checkout-total.vue @@ -12,6 +12,11 @@ -￥{{ orderTotal.coupon_price | unitPrice }}
+
  • + 会员折扣： + -￥{{ orderTotal.member_level_discount_price | unitPrice }} +
    +
  • 优惠金额： -￥{{ orderTotal.cash_back | unitPrice }} diff --git a/buyer/src/views/member/index.vue b/buyer/src/views/member/index.vue index ad9fd7d..1ab2335 100644 --- a/buyer/src/views/member/index.vue +++ b/buyer/src/views/member/index.vue @@ -12,7 +12,13 @@

    {{ user.nickname || user.uname }}

    联系方式：{{ user.mobile | secrecyMobile }}

    联系方式：无

    +
    + + + {{user.level_name}} +
    +

    我的订单

    @@ -342,8 +348,29 @@ export default { } } } + .level-box { + padding: 0 12px 0 10px; + font-size: 12px; + height: 24px; + background: rgb(255, 80, 0); + border-radius: 12px; + display: flex; + align-items: center; + justify-content: center; + color: #fff; + font-weight: 700; + margin-top: 10px; + .level-icon { + width: 20px !important; + height: 20px !important; + margin-right: 5px; + } + } .user-info { margin-left: 15px; + display: flex; + flex-direction: column; + align-items: flex-start; p { color: #777; font-size: 14px; diff --git a/buyer/src/views/member/my-order/detail.vue b/buyer/src/views/member/my-order/detail.vue index 55b1c3d..7da5794 100644 --- a/buyer/src/views/member/my-order/detail.vue +++ b/buyer/src/views/member/my-order/detail.vue @@ -29,6 +29,7 @@
    运费：
    ￥{{ (order.shipping_price || 0) | unitPrice }}
    优惠券抵扣:
    -￥{{ order.coupon_price | unitPrice }}
    优惠金额:
    -￥{{ order.cash_back | unitPrice }}
    +
    积分抵扣:
    -{{ order.use_point }}积分
    订单总价：
    ￥{{ (order.order_price || 0) | unitPrice }}
    在线支付金额：
    ￥{{ (order.need_pay_money || 0) | unitPrice }}
    diff --git a/manager-admin/src/views/shop/settlement-manage/settlementDetail.vue b/manager-admin/src/views/shop/settlement-manage/settlementDetail.vue index 2cd3907..edd5f65 100644 --- a/manager-admin/src/views/shop/settlement-manage/settlementDetail.vue +++ b/manager-admin/src/views/shop/settlement-manage/settlementDetail.vue @@ -69,6 +69,12 @@ 分销退还佣金总金额 ￥{{ settlement.distribution_return_rebate | unitPrice }} + + 平台承担会员等级优惠金额 + ￥{{ settlement.platform_member_level_price | unitPrice }} + 平台承担会员等级优惠退款金额 + ￥{{ settlement.platform_member_level_refund_price | unitPrice }} + 站点优惠券佣金 ￥{{ settlement.site_coupon_commi | unitPrice }} @@ -81,10 +87,12 @@ ￥{{ settlement.price | unitPrice }}(在线支付订单收入总金额) + ￥{{ settlement.refund_commi_price | unitPrice }}(平台退还佣金总金额) + ￥{{ settlement.distribution_return_rebate | unitPrice }}(分销退还佣金总金额) + + ￥{{ settlement.platform_member_level_price | unitPrice }}(平台承担会员等级优惠金额) - ￥{{ settlement.site_coupon_commi | unitPrice }}(站点优惠券佣金) - ￥{{ settlement.refund_price | unitPrice }}(在线支付订单退款总金额) - ￥{{ settlement.commi_price | unitPrice }}(平台收取佣金总金额) - ￥{{ settlement.distribution_rebate | unitPrice }}(分销支付佣金总金额) + - ￥{{ settlement.platform_member_level_refund_price | unitPrice }}(平台承担会员等级优惠退款金额) diff --git a/manager-seller/src/views/order/settlementDetail.vue b/manager-seller/src/views/order/settlementDetail.vue index f6d13d5..4ea16ab 100644 --- a/manager-seller/src/views/order/settlementDetail.vue +++ b/manager-seller/src/views/order/settlementDetail.vue @@ -65,12 +65,21 @@ 分销退还佣金总金额： {{ settlementData.distribution_return_rebate | unitPrice('￥') }}

    +

    + 平台承担会员等级优惠金额： + {{ settlementData.platform_member_level_price | unitPrice('￥') }} +

    +

    + 平台承担会员等级优惠退款金额： + {{ settlementData.platform_member_level_refund_price | unitPrice('￥') }} +

    本期应收金额： {{ settlementData.bill_price | unitPrice('￥') }} = {{ settlementData.price | unitPrice('￥') }} (在线支付订单收入总金额) - {{ settlementData.refund_price | unitPrice('￥') }} (在线支付订单退款总金额) - - {{ settlementData.commi_price | unitPrice('￥') }} (平台收取佣金总金额) - {{ settlementData.distribution_rebate | unitPrice('￥') }} (分销支付佣金总金额) + + {{ settlementData.platform_member_level_refund_price | unitPrice('￥') }} (平台承担会员等级优惠退款金额) -{{ settlementData.commi_price | unitPrice('￥') }} (平台收取佣金总金额) - {{ settlementData.distribution_rebate | unitPrice('￥') }} (分销支付佣金总金额) + {{ settlementData.refund_commi_price | unitPrice('￥') }} (平台退还佣金总金额) - {{ settlementData.site_coupon_commi | unitPrice('￥') }} (站点优惠券佣金) + - {{ settlementData.distribution_return_rebate | unitPrice('￥') }} (分销退还佣金总金额) + {{ settlementData.distribution_return_rebate | unitPrice('￥') }} (分销退还佣金总金额) + + {{ settlementData.platform_member_level_price | unitPrice('￥') }} (平台承担会员等级优惠金额)

    结算状态： -- Gitee