From 6f527067d19d40f00ddf1ada7d3211a9b6e62ff7 Mon Sep 17 00:00:00 2001 From: wangfukang <15630117759@163.com> Date: Thu, 10 Sep 2026 08:44:00 +0800 Subject: [PATCH] 1 --- src/views/app/shop/mernage.vue | 9 ++- .../sys/order-manage/logisticsAddress.vue | 57 ++++++++++++++----- .../sys/setting-manage/settingManage.vue | 13 +++++ 3 files changed, 63 insertions(+), 16 deletions(-) diff --git a/src/views/app/shop/mernage.vue b/src/views/app/shop/mernage.vue index bbd1a87..4f56820 100644 --- a/src/views/app/shop/mernage.vue +++ b/src/views/app/shop/mernage.vue @@ -7,12 +7,17 @@
- + - + + + + + + diff --git a/src/views/sys/order-manage/logisticsAddress.vue b/src/views/sys/order-manage/logisticsAddress.vue index 3ca4b8c..37e9860 100644 --- a/src/views/sys/order-manage/logisticsAddress.vue +++ b/src/views/sys/order-manage/logisticsAddress.vue @@ -6,6 +6,7 @@
订单编号：{{orderData.numberCode}}
支付订单编号：{{'ORDER'+orderData.id}}
订单类型：{{getOrderTypeText(orderData.orderType)}}
+
成团方式：虚拟成团
订单状态：{{getOrderStatusText(orderData)}}
创建时间：{{orderData.createTime | formatDateTime}}
支付时间：{{orderData.payTime | formatDateTime}}
@@ -57,7 +58,7 @@
锦鲤免单
¥{{orderData.freeAmount}}
-
+
优惠券
¥{{orderData.userCoupon[0].discountAmount}}
@@ -66,8 +67,8 @@
-¥{{orderData.userCouponNum}}
-->
{{orderData.status == 0 ? '待支付' : '实付'}}：¥{{orderData.totalAmount}}
-
平台服务费：¥{{(orderData.chouyong).toFixed(2)}}
-
商家预计收入：¥{{(orderData.yujishouru).toFixed(2)}}
+
平台服务费：¥{{formatMoney(orderData.chouyong)}} （{{getCommissionRateLabel(orderData)}} {{formatMoney(orderData.appliedCommissionRate)}}%）
+
商家预计收入：¥{{formatMoney(orderData.yujishouru)}}
@@ -179,7 +180,8 @@ orderData: { deliveryInfo: {}, goodsList: [], - mallRefundRecord: [] + mallRefundRecord: [], + userCoupon: [] }, returnFormData:{}, refundReason: "", @@ -231,14 +233,11 @@ this.orderData.mallRefundRecord = [sourceData]; } //商家预计收入的计算 - let price = (this.orderData.goodsAmount || 0) + (this.orderData.packageFee || 0) - if(this.orderData.orderType == 1){ - this.orderData.chouyong = price/100 * (shopTakeaway.commissionRateOne || 0) - this.orderData.yujishouru = price - this.orderData.chouyong - }else{ - this.orderData.chouyong = price/100 * (shopTakeaway.commissionRateMore || 0) - this.orderData.yujishouru = price - this.orderData.chouyong - } + let price = this.toAmount(this.orderData.goodsAmount) + this.toAmount(this.orderData.packageFee) + let commissionRate = this.getCommissionRate(this.orderData, shopTakeaway) + this.orderData.appliedCommissionRate = commissionRate + this.orderData.chouyong = price / 100 * commissionRate + this.orderData.yujishouru = price - this.orderData.chouyong } }); @@ -247,11 +246,13 @@ return Object.assign({ deliveryInfo: {}, goodsList: [], - mallRefundRecord: [] + mallRefundRecord: [], + userCoupon: [] }, data || {}, { deliveryInfo: (data && data.deliveryInfo) || {}, goodsList: (data && data.goodsList) || [], - mallRefundRecord: (data && data.mallRefundRecord) || [] + mallRefundRecord: (data && data.mallRefundRecord) || [], + userCoupon: (data && data.userCoupon) || [] }); }, getCurrentRefundRecord() { @@ -351,6 +352,34 @@ canAdminRefundOrder() { return this.orderData.status != 0 && this.orderData.status != 6 && this.orderData.status != 8 && this.orderData.status != 12; }, + toAmount(value) { + const num = Number(value); + return isNaN(num) ? 0 : num; + }, + formatMoney(value) { + return this.toAmount(value).toFixed(2); + }, + isVirtualGroupOrder(item) { + return !!item && item.isVirtualGroup == 1; + }, + getCommissionRate(order, shopTakeaway) { + const takeaway = shopTakeaway || {}; + if (order && order.orderType == 1) { + return this.toAmount(takeaway.commissionRateOne); + } + if (this.isVirtualGroupOrder(order)) { + const virtualRate = takeaway.virtualGroupCommissionRate; + return virtualRate !== undefined && virtualRate !== null && virtualRate !== "" + ? this.toAmount(virtualRate) + : this.toAmount(takeaway.commissionRateMore); + } + return this.toAmount(takeaway.commissionRateMore); + }, + getCommissionRateLabel(order) { + if (order && order.orderType == 1) return "单独购买抽佣比例"; + if (this.isVirtualGroupOrder(order)) return "虚拟成团抽佣比例"; + return "拼团抽佣比例"; + }, formatSpecs(data) { if (data == null || data === "") return ""; let str = typeof data === "object" ? JSON.stringify(data) : String(data); diff --git a/src/views/sys/setting-manage/settingManage.vue b/src/views/sys/setting-manage/settingManage.vue index e2acbc2..40a9561 100644 --- a/src/views/sys/setting-manage/settingManage.vue +++ b/src/views/sys/setting-manage/settingManage.vue @@ -119,6 +119,16 @@ 关闭后，仅保留学生证认证，便于上架审核通过后降低用户进入门槛。
+ + + 开 + 关 + +
+ 开启后，小程序首页点击 i/e 星球会进入我的个人空间审核页； + 关闭后保持原 i/e 星球首页入口。 +
+