From eca8370c7091f1fc3308f08499995728309a6ed5 Mon Sep 17 00:00:00 2001 From: "pikachu1995@126.com" Date: Wed, 24 Jan 2024 14:58:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=B0=83=E4=BC=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seller/src/views/shop/bill/billDetail.vue | 46 +++++++++-------------- 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue index 9b92d307..bf439b8f 100644 --- a/seller/src/views/shop/bill/billDetail.vue +++ b/seller/src/views/shop/bill/billDetail.vue @@ -325,7 +325,7 @@ export default { return h("div", this.$options.filters.unitPrice(params.row.billPrice, "￥") ); }else{ - return h("priceColorScheme", {props: {value: (0-params.row.finalPrice), color: this.$mainColor}}); + return h("priceColorScheme", {props: {value: (0-params.row.billPrice), color: this.$mainColor}}); } }, }, @@ -337,7 +337,7 @@ export default { align: 'center', children: [{ title: "补贴", - key: "billPrice", + key: "subsidy", render: (h, params) => { if (params.row.pointSettlementPrice == 0) { return h("div", "-"); @@ -351,25 +351,25 @@ export default { }, { title: "用户实付", - key: "billPrice", - render: (h, params) => { - if(params.row.flowType == "PAY"){ - return h("div", this.$options.filters.unitPrice(params.row.siteCouponCommission, "￥") - ); - }else{ - return h("priceColorScheme", {props: {value: (0-params.row.siteCouponCommission)}}); - } - }, - }, - { - title: "合计", - key: "billPrice", + key: "finalPrice", render: (h, params) => { if(params.row.flowType == "PAY"){ return h("div", this.$options.filters.unitPrice(params.row.finalPrice, "￥") ); }else{ - return h("priceColorScheme", {props: {value: (0-params.row.billPrice)}}); + return h("priceColorScheme", {props: {value: (0-params.row.finalPrice)}}); + } + }, + }, + { + title: "合计", + key: "total", + render: (h, params) => { + if(params.row.flowType == "PAY"){ + return h("div", this.$options.filters.unitPrice((params.row.finalPrice+(params.row.pointSettlementPrice+params.row.kanjiaSettlementPrice+params.row.siteCouponCommission)), "￥") + ); + }else{ + return h("priceColorScheme", {props: {value: (0-(params.row.finalPrice+(params.row.pointSettlementPrice+params.row.kanjiaSettlementPrice+params.row.siteCouponCommission)))}}); } }, }, @@ -381,7 +381,7 @@ export default { align: 'center', children: [{ title: "平台服务费", - key: "billPrice", + key: "commissionPrice", render: (h, params) => { if (params.row.commissionPrice == 0) { return h("div", "-"); @@ -405,18 +405,6 @@ export default { }else{ return h("priceColorScheme", {props: {value: (0-params.row.distributionRebate)}}); } - - // if (params.row.distributionRebate == null) { - // return h("div", "-"); - // } else { - // return h( - // "div", - // this.$options.filters.unitPrice( - // params.row.distributionRebate, - // "￥" - // ) - // ); - // } }, }, { From 83593bd015e9411a14c0da4dfd76d8dbd132c709 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Wed, 24 Jan 2024 19:23:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=8D=E9=9C=80=E8=A6=81=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/pages/payment/Pay.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/buyer/src/pages/payment/Pay.vue b/buyer/src/pages/payment/Pay.vue index 779603e6..a9c3463b 100644 --- a/buyer/src/pages/payment/Pay.vue +++ b/buyer/src/pages/payment/Pay.vue @@ -18,7 +18,7 @@
-
+
收货人信息 管理收货人地址 @@ -89,7 +89,7 @@
-
+
配送方式
@@ -227,7 +227,7 @@ }}  {{ selectedAddress.mobile }}
- 自提地点：{{selectedStoreAddress.address}}   联系方式：{{ selectedStoreAddress.mobile }} + 自提地点：{{selectedStoreAddress.address}}   联系方式：{{ selectedStoreAddress.mobile }}
@@ -266,6 +266,7 @@ export default { invoiceAvailable: false, // 发票编辑按钮 showEditBtn: "", // 鼠标移入显示编辑按钮 orderMark: "", // 订单备注 + goodsType: "", // 商品类型 storeMoreAddr: false, invoiceData: { // 发票数据 @@ -390,6 +391,9 @@ export default { this.goodsList = res.result.cartList; this.priceDetailDTO = res.result.priceDetailDTO; this.skuList = res.result.skuList; + if (res.result.skuList[0] && res.result.skuList[0].goodsSku) { + this.goodsType = res.result.skuList[0].goodsSku.goodsType; + } this.storeId = this.goodsList[0].storeId if (res.result.receiptVO) { this.invoiceData = res.result.receiptVO; From 8cfc420085be4a40140562bf56e35773f517a8a8 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Thu, 25 Jan 2024 09:36:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=B9=B0=E5=AE=B6=E7=AB=AF=E8=99=9A?= =?UTF-8?q?=E6=8B=9F=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=9C=B0=E5=9D=80=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/pages/home/orderCenter/OrderDetail.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue index 39d75a59..2d6e5133 100644 --- a/buyer/src/pages/home/orderCenter/OrderDetail.vue +++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue @@ -54,7 +54,7 @@ >
-
+

收货人信息

收货人：{{ order.order.consigneeName }}

手机号码：{{ order.order.consigneeMobile | secrecyMobile }}

@@ -63,7 +63,7 @@ {{ order.order.consigneeDetail }}

-
+

自提点信息

自提点名称：{{ order.order.storeAddressPath }}

联系方式：{{ order.order.storeAddressMobile }}

@@ -73,7 +73,7 @@

支付方式：{{ order.paymentMethodValue }}

付款状态：{{ order.payStatusValue }}

-
+

配送信息

配送方式：{{ order.deliveryMethodValue }}

配送状态：{{ order.deliverStatusValue }}

@@ -187,7 +187,7 @@ >{{ order.order.goodsPrice | unitPrice("￥") }}
-
+
运费：+{{ order.order.freightPrice | unitPrice("￥") }}