From 2b970bce3c816715b101494ba51183727d431599 Mon Sep 17 00:00:00 2001 From: jianweie code Date: Sun, 31 Mar 2024 01:35:07 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=94=AE=E5=90=8E=E6=A8=A1=E5=BC=8F=E5=8F=8A=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E6=96=B9=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Order/CoreCmsOrderServices.cs | 13 +- .../member/afterSales/submit/submit.scss | 17 +- .../pages/member/afterSales/submit/submit.vue | 809 ++++++++++-------- .../views/order/billaftersales/details.html | 2 +- .../views/order/billaftersales/edit.html | 8 +- .../views/order/billaftersales/index.html | 12 +- 6 files changed, 489 insertions(+), 372 deletions(-) diff --git a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs index 18a9a998..9a63a887 100644 --- a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs +++ b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs @@ -950,8 +950,17 @@ namespace CoreCms.Net.Services if (item.status == (int)GlobalEnumVars.BillAftersalesStatus.WaitAudit) break; } } - //把退款金额和退货商品查出来判断是否能进行售后 - AfterSalesVal(order, aftersaleLevel); + //如果存在未处理的售后，就不能再次发起售后 + if (order.aftersalesItem.Any() && order.aftersalesItem.Exists(p => p.status == (int)GlobalEnumVars.BillAftersalesStatus.WaitAudit)) + { + order.addAftersalesStatus = false; + } + else + { + //把退款金额和退货商品查出来判断是否能进行售后 + AfterSalesVal(order, aftersaleLevel); + } + //促销信息 if (!string.IsNullOrEmpty(order.promotionList)) { diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.scss index a06188fc..2680d19b 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.scss +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.scss @@ -38,8 +38,21 @@ .cart-checkbox-c { display: inline-block; position: absolute; top: 50%; left: 13px; transform: translateY(-50%); z-index: 99; } -.goods-salesvolume { min-width: 50px; height: 15px; font-size: 12px; color: #999; display: inline-block; } - +.goods-salesvolume { min-width: 50px; height: 15px; font-size: 12px; color: #999; display: inline-block; } +.list-box{ + background-color: #fff; + margin-bottom: 5rpx; +} +.goods-flex{ + display: flex; + align-items: center; + font-size: 12px; + color: #999; + background: #fff; + padding-left: 133px; + padding-bottom: 5px; +} uni-checkbox.checkboxNo .uni-checkbox-input { background-color: #e1e1e1 !important; border-color: #e1e1e1 !important; } .icon { width: 25px; height: 25px; /* #ifdef MP-ALIPAY */ background-size: 100% 100%; /* #endif */ } +.coreshop-tabbar-height { margin-top: 0px; } \ No newline at end of file diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue index 09c63016..ae906b7e 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue @@ -11,82 +11,29 @@ - - - - - - - - 请选择退货商品和数量 - + +
- - - - - - - - 是否收货 + 售后模式 - + + + + + + + + + + + + + + + + 退款金额 @@ -116,10 +127,9 @@ - - 可修改，最多￥{{maxRefund}}，含发货邮费￥{{costFreight}} + 可修改，最多￥{{ maxRefund }}，含发货邮费￥{{ costFreight }} @@ -127,12 +137,15 @@ 上传凭证 - {{images.length}}/{{imageMax}} + {{ images.length }}/{{ imageMax + }} + - + @@ -163,300 +176,382 @@ diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/details.html index 7c043be1..062a0d44 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/details.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/details.html @@ -21,7 +21,7 @@
- {{ d.params.data.type === 1 ? '未收到货':'已收到货' }} + {{ d.params.data.type === 1 ? '仅退款':'退款退货' }}
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/edit.html index ca60f5ac..63076968 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/edit.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/edit.html @@ -63,10 +63,10 @@
订单支付金额：{{ d.params.data.order.payedAmount }},已退款金额：{{ d.params.data.order.refunded }}
- +
- - + +
@@ -86,7 +86,7 @@
- 1. 选择”未收到货“是退未发货的商品，选择”已收到货“是退已发货的商品，选择”未收到货“不会生成退货单，选择”已收到货“会生成退货单，未发货的商品和已发货的商品不能混合着退。
+ 1. 选择”仅退款“是退未发货的商品，选择”退款退货“是退已发货的商品，选择”仅退款“不会生成退货单，选择”退款退货“会生成退货单，未发货的商品和已发货的商品不能混合着退。
2. "售后数量"里的数字包含已提交的售后和审核通过的售后的商品数量，后面如果有括号，表示已发货的商品的退货数量。
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/index.html index e0418aa8..6bd67443 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/index.html @@ -34,9 +34,9 @@
@@ -128,11 +128,11 @@ { field: 'aftersalesId', title: '售后单号', sort: false, width: 150 }, { field: 'orderId', title: '订单号', sort: false, width: 150 }, { - field: 'type', title: '商品状态', sort: false, width: 105, templet: function (d) { + field: 'type', title: '售后类型', sort: false, width: 105, templet: function (d) { if (d.type === 1) { - return "未收到货"; + return "仅退款"; } else { - return "已收到货"; + return "退款退货"; } } },