From ecb93aef80a8a427240e0bf4e2c0650e8c8d335d Mon Sep 17 00:00:00 2001 From: JianWeie Date: Mon, 28 Feb 2022 22:00:37 +0800 Subject: [PATCH] =?UTF-8?q?#=202022-02-25=20###=201.3.8=20=E5=BC=80?= =?UTF-8?q?=E6=BA=90=E7=A4=BE=E5=8C=BA=E7=89=88=EF=BC=88=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=93=E4=B8=9A=E7=89=88=EF=BC=89=EF=BC=9A?= =?UTF-8?q?=20=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=97=B6=E9=97=B4=E4=BB=8E?= =?UTF-8?q?=E4=B8=96=E7=95=8C=E6=97=B6=E6=94=B9=E4=B8=BA=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=85=B7=E4=BD=93=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=83=85=E5=86=B5=E4=B8=8B=E5=AF=BC=E8=87=B4=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=B8=8D=E6=89=A7=E8=A1=8C=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E3=80=82#I4VJU3=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E7=AB=AF=E8=BF=9B=E8=A1=8C=E5=89=8D?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=88=86=E7=A6=BB=EF=BC=8C=E6=9C=89=E4=B8=AA?= =?UTF-8?q?=E5=88=AB=E9=A1=B5=E9=9D=A2=E6=9C=AA=E8=B0=83=E7=94=A8=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82#I4VIZ1=20=E3=80=90?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=88=86=E7=B1=BB=E6=9C=AA=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82#I4V8UJ?= =?UTF-8?q?=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=93=81=E7=89=8C=E5=88=A0=E9=99=A4=E6=9C=AA?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E2=80=9C=E4=BC=AA=E5=88=A0=E9=99=A4=E7=9A=84?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=95=B0=E6=8D=AE=E2=80=9D=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=88=A0=E9=99=A4=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82#I4V7WU=20=E3=80=90=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=8E=92=E5=88=97=E6=A0=B7=E5=BC=8F=E6=B7=B7?= =?UTF-8?q?=E4=B9=B1=E9=97=AE=E9=A2=98=E3=80=82#I4V3K6=20=E3=80=90?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=B7=BB=E5=8A=A0=E7=BC=96=E8=BE=91=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=9B=A0=E4=B8=BA=E6=A0=A1=E9=AA=8Cinput?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=87=8D=E5=90=8D=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0=E5=BC=B9=E7=AA=97=E5=8F=96?= =?UTF-8?q?=E6=B6=88=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=85=B6=E4=BB=96=E5=90=8C?= =?UTF-8?q?=E5=90=8D=E6=A0=A1=E9=AA=8C=E8=A2=AB=E6=B1=A1=E6=9F=93=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=8F=82=E6=95=B0=E7=BB=B4=E6=8A=A4=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82#I4UWQJ=20###=200.?= =?UTF-8?q?2.6=20=E4=B8=93=E4=B8=9A=E7=89=88=EF=BC=9A=20=E3=80=90=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E3=80=81=E5=9B=A2=E8=B4=AD=E8=AF=A6=E6=83=85=E3=80=81?= =?UTF-8?q?=E7=A7=92=E6=9D=80=E8=AF=A6=E6=83=85=E3=80=81=E6=8B=BC=E5=9B=A2?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8F=82=E6=95=B0=E6=8E=92=E5=88=97=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E6=B7=B7=E4=B9=B1=E9=97=AE=E9=A2=98=E3=80=82#I4V3K6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Task/HangfireDispose.cs | 16 ++++++++-------- .../pages/goods/goodDetails/goodDetails.vue | 8 +++----- .../Article/CoreCmsArticleTypeController.cs | 3 ++- .../Controllers/Good/CoreCmsBrandController.cs | 2 +- .../views/content/article/articletype/index.html | 2 +- .../wwwroot/views/good/goodsparams/create.html | 6 +++--- .../wwwroot/views/good/goodsparams/edit.html | 7 +++---- .../wwwroot/views/order/servicesOrder/index.html | 2 +- 8 files changed, 22 insertions(+), 24 deletions(-) diff --git a/CoreCms.Net.Task/HangfireDispose.cs b/CoreCms.Net.Task/HangfireDispose.cs index c354708..042d6bb 100644 --- a/CoreCms.Net.Task/HangfireDispose.cs +++ b/CoreCms.Net.Task/HangfireDispose.cs @@ -42,28 +42,28 @@ namespace CoreCms.Net.Task //自动取消订单任务 - RecurringJob.AddOrUpdate(s => s.Execute(), "0 0/5 * * * ? ", TimeZoneInfo.Utc); // 每5分钟取消一次订单 + RecurringJob.AddOrUpdate(s => s.Execute(), "0 0/5 * * * ? ", TimeZoneInfo.Local); // 每5分钟取消一次订单 //自动完成订单任务 - RecurringJob.AddOrUpdate(s => s.Execute(), "0 0 0/1 * * ? ", TimeZoneInfo.Utc); // 每小时自动完成订单 + RecurringJob.AddOrUpdate(s => s.Execute(), "0 0 0/1 * * ? ", TimeZoneInfo.Local); // 每小时自动完成订单 //自动评价订单任务 - RecurringJob.AddOrUpdate(s => s.Execute(), "0 0 0/1 * * ? ", TimeZoneInfo.Utc); // 每小时自动完成订单 + RecurringJob.AddOrUpdate(s => s.Execute(), "0 0 0/1 * * ? ", TimeZoneInfo.Local); // 每小时自动完成订单 //自动签收订单任务 - RecurringJob.AddOrUpdate(s => s.Execute(), "0 0 0/1 * * ? ", TimeZoneInfo.Utc); // 每小时自动完成订单 + RecurringJob.AddOrUpdate(s => s.Execute(), "0 0 0/1 * * ? ", TimeZoneInfo.Local); // 每小时自动完成订单 //催付款订单 - RecurringJob.AddOrUpdate(s => s.Execute(), "0 0/5 * * * ? ", TimeZoneInfo.Utc); // 每5分钟催付款订单 + RecurringJob.AddOrUpdate(s => s.Execute(), "0 0/5 * * * ? ", TimeZoneInfo.Local); // 每5分钟催付款订单 //拼团自动取消到期团（每分钟执行一次） - RecurringJob.AddOrUpdate(s => s.Execute(), "0 0/2 * * * ? ", TimeZoneInfo.Utc); // 每分钟取消一次订单 + RecurringJob.AddOrUpdate(s => s.Execute(), "0 0/2 * * * ? ", TimeZoneInfo.Local); // 每分钟取消一次订单 //每天凌晨5点定期清理7天前操作日志 - RecurringJob.AddOrUpdate(s => s.Execute(), "0 0 5 * * ? ", TimeZoneInfo.Utc); // 每天5点固定时间清理一次 + RecurringJob.AddOrUpdate(s => s.Execute(), "0 0 5 * * ? ", TimeZoneInfo.Local); // 每天5点固定时间清理一次 //定时刷新获取微信AccessToken - RecurringJob.AddOrUpdate(s => s.Execute(), "0 0/4 * * * ? ", TimeZoneInfo.Utc); // 每2分钟刷新获取微信AccessToken + RecurringJob.AddOrUpdate(s => s.Execute(), "0 0/4 * * * ? ", TimeZoneInfo.Local); // 每2分钟刷新获取微信AccessToken } 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 cbe97d7..122905f 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue @@ -185,11 +185,9 @@ 商品详情 - - - {{ item.name || ''}}： - {{ item.value || ''}} - + + {{ item.name || ''}}： + {{ item.value || ''}} diff --git a/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleTypeController.cs b/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleTypeController.cs index 1bee497..0627805 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleTypeController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Article/CoreCmsArticleTypeController.cs @@ -73,7 +73,8 @@ namespace CoreCms.Net.Web.Admin.Controllers var jm = new AdminUiCallBack(); //获取数据 - var list = await _coreCmsArticleTypeServices.QueryAsync(); + var list = await _coreCmsArticleTypeServices.QueryListByClauseAsync(p => p.id > 0, p => p.sort, + OrderByType.Desc); //返回数据 jm.data = list; jm.code = 0; diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsBrandController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsBrandController.cs index 93f29ea..e77037f 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsBrandController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsBrandController.cs @@ -311,7 +311,7 @@ namespace CoreCms.Net.Web.Admin.Controllers return jm; } - if (await _goodsServices.ExistsAsync(p => p.brandId == model.id)) + if (await _goodsServices.ExistsAsync(p => p.brandId == model.id && !p.isDel)) { jm.msg = "有商品关联品牌数据,禁止删除"; return jm; diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articletype/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articletype/index.html index 5fdf2b9..b274045 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articletype/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articletype/index.html @@ -10,7 +10,7 @@ -
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goodsparams/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goodsparams/create.html index 5231a73..bfc3833 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goodsparams/create.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goodsparams/create.html @@ -6,13 +6,13 @@
- +
- {{# layui.each(d.params.data.goodsParamTypes, function(index, item){ }} @@ -46,7 +46,7 @@ , coreHelper = layui.coreHelper; form.verify({ - verifyname: [/^[\S]{0,10}$/, '参数名称最大只允许输入10位字符，且不能出现空格'], + verifyParamsname: [/^[\S]{0,10}$/, '参数名称最大只允许输入10位字符，且不能出现空格'], verifytype: [/^[\S]{0,10}$/, '参数类型最大只允许输入10位字符，且不能出现空格'], }); //重载form diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goodsparams/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goodsparams/edit.html index 86fdc6f..cb99de3 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goodsparams/edit.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goodsparams/edit.html @@ -8,13 +8,13 @@
- +
- {{# layui.each(d.params.data.goodsParamTypes, function(index, item){ }} @@ -49,8 +49,7 @@ , coreHelper = layui.coreHelper; form.verify({ - - verifyname: [/^[\S]{0,10}$/, '参数名称最大只允许输入50位字符，且不能出现空格'], + verifyParamsname: [/^[\S]{0,10}$/, '参数名称最大只允许输入50位字符，且不能出现空格'], verifytype: [/^[\S]{0,10}$/, '参数类型最大只允许输入10位字符，且不能出现空格'], }); //重载form diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/servicesOrder/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/servicesOrder/index.html index 832c72f..9456e25 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/order/servicesOrder/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/servicesOrder/index.html @@ -10,7 +10,7 @@ -