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 @@ -