From e81f52516f71980ad89b1efbc1243a621bf8ff57 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Thu, 7 Oct 2021 22:13:51 +0800 Subject: [PATCH] =?UTF-8?q?##=201.0.2=EF=BC=882021.10.07=EF=BC=89=201?= =?UTF-8?q?=E3=80=81=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E5=95=86=E5=93=81=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E6=A3=80=E7=B4=A2=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?#I4CSX2=202=E3=80=81=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E4=B8=8B?= =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=BA=95=E9=83=A8=E8=B4=B4=E5=BA=95?= =?UTF-8?q?=E6=97=A0=E9=97=B4=E9=9A=99=E9=97=AE=E9=A2=98=E3=80=82=203?= =?UTF-8?q?=E3=80=81=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E5=A4=9A=E4=B8=AA=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E3=80=90=E5=9C=A8=E7=BA=BF=E5=AE=A2=E6=9C=8D=E3=80=91?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB=E5=A4=B1=E6=95=88=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/groupBuying/details/details.vue | 6 ++- .../activity/pinTuan/details/details.vue | 6 ++- .../activity/seckill/details/details.vue | 6 ++- .../pages/goods/goodDetails/goodDetails.vue | 6 ++- .../pages/member/afterSales/detail/detail.vue | 48 ++++++++++--------- .../pages/member/order/detail/detail.vue | 6 ++- .../Controllers/GoodController.cs | 28 +++++------ 7 files changed, 57 insertions(+), 49 deletions(-) diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue index 514188f..e44d63d 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue @@ -351,11 +351,13 @@ - + - + diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue index 0551147..66a97e6 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue @@ -392,11 +392,13 @@ - + - + diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue index add5b72..409462b 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue @@ -354,11 +354,13 @@ - + - + diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue index 6ac3029..43bc88c 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue @@ -298,11 +298,13 @@ - + - + diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/detail/detail.vue index a2e4392..72298b4 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/detail/detail.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/detail/detail.vue @@ -26,11 +26,11 @@ 售后单进度 - + - {{statusName}} - {{reshipName}} - {{refundName}} + {{statusName}} + {{reshipName}} + {{refundName}} @@ -39,14 +39,14 @@ 退货邮寄信息 - + - - + + - - - + + + 收货人： {{ reshipInfo.reshipName }} {{ reshipInfo.reshipMobile }} @@ -54,9 +54,9 @@ {{ reshipInfo.reshipArea + reshipInfo.reshipAddress }} - - - + + + @@ -65,14 +65,14 @@ 商品信息 - + {{item.name}} 售后单号：{{item.aftersalesId}} - + 退货数量:{{item.nums}} @@ -85,7 +85,7 @@ 状态 - + 商品状态 @@ -98,15 +98,17 @@ {{refund}}元 - - 联系客服 + + + 联系客服 + 图片凭证 - + @@ -119,7 +121,7 @@ 问题描述 - + {{reason}} 暂无描述 @@ -131,7 +133,7 @@ 请填写回邮商品物流信息 - + @@ -159,7 +161,7 @@ 快递公司 - + 快递公司 @@ -170,7 +172,7 @@ 物流单号 {{logiNo}} - + diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue index aa2793e..306597f 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue @@ -80,7 +80,7 @@ - 邀请拼单 + 邀请拼单 @@ -292,7 +292,9 @@ - 联系客服 + + 联系客服 + diff --git a/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs b/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs index e5ea40b..9bbcd28 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs @@ -155,7 +155,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers where = where.And(p => p.isMarketable == true); var className = string.Empty; - if (!string.IsNullOrEmpty(entity.where)) + if (!string.IsNullOrWhiteSpace(entity.where)) { var obj = JsonConvert.DeserializeAnonymousType(entity.where, new { @@ -167,7 +167,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers searchName = "", }); - if (!string.IsNullOrEmpty(obj.priceFrom)) + if (!string.IsNullOrWhiteSpace(obj.priceFrom)) { var priceF = obj.priceFrom.ObjectToDouble(0); if (priceF >= 0) @@ -176,19 +176,19 @@ namespace CoreCms.Net.Web.WebApi.Controllers where = where.And(p => p.price >= f); } } - if (!string.IsNullOrEmpty(obj.priceTo)) + if (!string.IsNullOrWhiteSpace(obj.priceTo)) { var priceT = obj.priceTo.ObjectToDouble(0); - if (priceT >= 0) + if (priceT > 0) { var f = Convert.ToDecimal(priceT); where = where.And(p => p.price <= f); } } - if (!string.IsNullOrEmpty(obj.catId)) + if (!string.IsNullOrWhiteSpace(obj.catId)) { var catId = obj.catId.ObjectToInt(0); - if (catId >= 0) + if (catId > 0) { var category = await _goodsCategoryServices.QueryByIdAsync(catId); if (category != null) @@ -208,30 +208,26 @@ namespace CoreCms.Net.Web.WebApi.Controllers } } } - if (!string.IsNullOrEmpty(obj.brandId)) + if (!string.IsNullOrWhiteSpace(obj.brandId)) { var brandId = obj.brandId.ObjectToInt(0); - if (brandId >= 0) + if (brandId > 0) { where = where.And(p => p.brandId == brandId); } } - if (!string.IsNullOrEmpty(obj.labelId)) + if (!string.IsNullOrWhiteSpace(obj.labelId)) { - var brandId = obj.brandId.ObjectToInt(0); - if (brandId >= 0) - { - where = where.And(p => p.brandId == brandId); - } + where = where.And(p => p.labelIds.Contains(obj.labelId)); } - if (!string.IsNullOrEmpty(obj.searchName)) + if (!string.IsNullOrWhiteSpace(obj.searchName)) { where = where.And(p => p.name.Contains(obj.searchName)); } } var orderBy = " isRecommend desc,isHot desc"; - if (!string.IsNullOrEmpty(entity.order)) + if (!string.IsNullOrWhiteSpace(entity.order)) { orderBy += "," + entity.order; }