From 0802ce8618c8a82c58674cf3e8dc58d32d44c189 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Mon, 29 Nov 2021 01:25:45 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=AC=E5=9C=B0=E5=AD=98=E5=82=A8=E5=9F=9F?= =?UTF-8?q?=E5=90=8D=E8=A7=84=E5=88=99=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E5=89=8D=E5=90=8E=E7=AB=AF=E4=B8=8D=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82#I4K56N?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Configuration/GlobalEnumVars.cs | 12 +++++++ CoreCms.Net.IServices/Com/IToolsServices.cs | 7 +++-- CoreCms.Net.Services/Com/ToolsServices.cs | 31 ++++++++++++++++--- .../Controllers/CommonController.cs | 2 +- 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/CoreCms.Net.Configuration/GlobalEnumVars.cs b/CoreCms.Net.Configuration/GlobalEnumVars.cs index bc9e76b..c2f2506 100644 --- a/CoreCms.Net.Configuration/GlobalEnumVars.cs +++ b/CoreCms.Net.Configuration/GlobalEnumVars.cs @@ -109,6 +109,18 @@ namespace CoreCms.Net.Configuration QiNiuKoDo = 3, } + + /// + /// 本地存储位置 + /// + public enum FilesStorageLocation + { + [Description("后端")] + Admin = 0, + [Description("API接口端")] + API = 1 + } + #endregion #region User用户相关=========================================================================== diff --git a/CoreCms.Net.IServices/Com/IToolsServices.cs b/CoreCms.Net.IServices/Com/IToolsServices.cs index 92dc1aa..5500791 100644 --- a/CoreCms.Net.IServices/Com/IToolsServices.cs +++ b/CoreCms.Net.IServices/Com/IToolsServices.cs @@ -11,8 +11,10 @@ using System; using System.IO; using System.Threading.Tasks; +using CoreCms.Net.Configuration; using CoreCms.Net.Model.Entities; using CoreCms.Net.Model.ViewModels.Options; +using CoreCms.Net.Model.ViewModels.UI; using Microsoft.AspNetCore.Http; namespace CoreCms.Net.IServices @@ -37,13 +39,12 @@ namespace CoreCms.Net.IServices /// Task IllegalWordsContainsAny(string oldString); - #region FIle文件上传处理 /// /// 本地上传（File） /// /// - Task UpLoadFileForLocalStorage(FilesStorageOptions options, string fileExt, IFormFile file); + Task UpLoadFileForLocalStorage(FilesStorageOptions options, string fileExt, IFormFile file, int filesStorageLocation = (int)GlobalEnumVars.FilesStorageLocation.Admin); /// /// AliYunOSS-阿里云上传方法（File） @@ -70,7 +71,7 @@ namespace CoreCms.Net.IServices /// 本地上传（Base64） /// /// - string UpLoadBase64ForLocalStorage(FilesStorageOptions options, MemoryStream memStream); + string UpLoadBase64ForLocalStorage(FilesStorageOptions options, MemoryStream memStream, int filesStorageLocation = (int)GlobalEnumVars.FilesStorageLocation.Admin); /// /// AliYunOSS-阿里云上传方法（Base64） diff --git a/CoreCms.Net.Services/Com/ToolsServices.cs b/CoreCms.Net.Services/Com/ToolsServices.cs index 6351fa2..bdf2f8b 100644 --- a/CoreCms.Net.Services/Com/ToolsServices.cs +++ b/CoreCms.Net.Services/Com/ToolsServices.cs @@ -44,6 +44,7 @@ namespace CoreCms.Net.Services private readonly IWebHostEnvironment _webHostEnvironment; + public ToolsServices(IWebHostEnvironment hostEnvironment, IWebHostEnvironment webHostEnvironment) { _hostEnvironment = hostEnvironment; @@ -112,16 +113,17 @@ namespace CoreCms.Net.Services } - #region 本地上传方法(File) + /// /// 本地上传方法(File) /// /// /// /// + /// /// - public async Task UpLoadFileForLocalStorage(FilesStorageOptions options, string fileExt, IFormFile file) + public async Task UpLoadFileForLocalStorage(FilesStorageOptions options, string fileExt, IFormFile file, int filesStorageLocation = (int)GlobalEnumVars.FilesStorageLocation.Admin) { var newFileName = DateTime.Now.ToString("yyyyMMddHHmmss_ffff", DateTimeFormatInfo.InvariantInfo) + fileExt; @@ -133,7 +135,15 @@ namespace CoreCms.Net.Services var filePath = dirPath + newFileName; var fileUrl = saveUrl + newFileName; - string bucketBindDomain = AppSettingsConstVars.AppConfigAppUrl; + string bucketBindDomain = string.Empty; + if (filesStorageLocation == (int)GlobalEnumVars.FilesStorageLocation.Admin) + { + bucketBindDomain = AppSettingsConstVars.AppConfigAppUrl; + } + else if (filesStorageLocation == (int)GlobalEnumVars.FilesStorageLocation.API) + { + bucketBindDomain = AppSettingsConstVars.AppConfigAppInterFaceUrl; + } await using (var fs = System.IO.File.Create(filePath)) { @@ -277,13 +287,15 @@ namespace CoreCms.Net.Services #region 本地上传方法(Base64) + /// /// 本地上传方法(Base64) /// /// /// + /// /// - public string UpLoadBase64ForLocalStorage(FilesStorageOptions options, MemoryStream memStream) + public string UpLoadBase64ForLocalStorage(FilesStorageOptions options, MemoryStream memStream, int filesStorageLocation = (int)GlobalEnumVars.FilesStorageLocation.Admin) { var jm = new AdminUiCallBack(); @@ -295,7 +307,16 @@ namespace CoreCms.Net.Services var saveUrl = options.Path + today + "/"; var dirPath = _webHostEnvironment.WebRootPath + saveUrl; - string bucketBindDomain = AppSettingsConstVars.AppConfigAppUrl; + + string bucketBindDomain = string.Empty; + if (filesStorageLocation == (int)GlobalEnumVars.FilesStorageLocation.Admin) + { + bucketBindDomain = AppSettingsConstVars.AppConfigAppUrl; + } + else if (filesStorageLocation == (int)GlobalEnumVars.FilesStorageLocation.API) + { + bucketBindDomain = AppSettingsConstVars.AppConfigAppInterFaceUrl; + } if (!Directory.Exists(dirPath)) Directory.CreateDirectory(dirPath); var filePath = dirPath + newFileName; diff --git a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs index e0e6532..7c65aab 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs @@ -294,7 +294,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers string url = string.Empty; if (filesStorageOptions.StorageType == GlobalEnumVars.FilesStorageOptionsType.LocalStorage.ToString()) { - url = await _toolsServices.UpLoadFileForLocalStorage(filesStorageOptions, fileExt, file); + url = await _toolsServices.UpLoadFileForLocalStorage(filesStorageOptions, fileExt, file, (int)GlobalEnumVars.FilesStorageLocation.API); } else if (filesStorageOptions.StorageType == GlobalEnumVars.FilesStorageOptionsType.AliYunOSS.ToString()) { -- Gitee From 30cd5459e07aaf86a3a800ecd702af2cc8deff41 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Mon, 29 Nov 2021 21:04:11 +0800 Subject: [PATCH 2/6] =?UTF-8?q?##=201.2.1=EF=BC=882021-11-29=EF=BC=89=20?= =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E8=B0=83=E6=95=B4=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E5=AD=98=E5=82=A8=E5=9F=9F=E5=90=8D=E8=A7=84=E5=88=99?= =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0=E5=89=8D=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E4=B8=8D=E7=BB=9F=E4=B8=80=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?#I4K56N=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=9B=A0=E5=88=9D=E5=A7=8B=E5=8C=96coreshop=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E5=B0=8F=E5=86=99=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82#I4K6KH=20=E3=80=90?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=9C=AC=E5=BA=97=E6=8E=A8=E8=8D=90=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=AB=98=E5=BA=A6=E4=B8=8D=E5=A4=9F=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AE=8C=E5=85=A8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=20=E3=80=90=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8Dsku=E8=BF=87=E5=A4=9A=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=BC=B9=E5=87=BA=E5=B1=82=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=BC=B8=E7=BC=A9=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?#I4K994=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D21=E5=AF=B8=E4=BB=A5=E4=B8=8B=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=99=A8=E5=90=8E=E5=8F=B0=E5=B9=B3=E5=8F=B0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82#I4K5A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoreShop/pages/activity/groupBuying/details/details.vue | 2 +- .../CoreShop/pages/activity/pinTuan/details/details.vue | 2 +- .../CoreShop/pages/activity/seckill/details/details.vue | 2 +- CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue | 2 +- .../CoreShop/pages/goods/goodDetails/goodDetails.vue | 2 +- CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss | 2 +- CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs | 4 ++-- CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.css | 1 - CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.less | 2 +- CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.min.css | 2 +- 10 files changed, 10 insertions(+), 11 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 cc58202..07740be 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 @@ -269,7 +269,7 @@ - + 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 dfb376a..73d8737 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 @@ -433,7 +433,7 @@ - + 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 11536aa..ac279e6 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 @@ -270,7 +270,7 @@ - + diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue index d558ed3..1078cf2 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/form/details/details.vue @@ -223,7 +223,7 @@ - + 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 d3b0562..cbe97d7 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue @@ -318,7 +318,7 @@ - + diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss index 5bf30c0..9540cc0 100644 --- a/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss +++ b/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss @@ -686,7 +686,7 @@ page, .bg-page { background: #f7f7f7; } } .coreshop-good-shop-recommend-list-box { .recommend-scroll-box { position: relative; width: 100%; - .recommend-scroll { position: relative; height: 320rpx; white-space: nowrap; width: 100%; + .recommend-scroll { position: relative; height: 360rpx; white-space: nowrap; width: 100%; .recommend-scroll-item { display: inline-block; padding-top: 28rpx; width: 200rpx; padding-right: 18rpx; white-space: initial; .coreshop-avatar { width: 180rpx; height: 180rpx; } } diff --git a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs index 757f03a..7b806ab 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs @@ -274,12 +274,12 @@ namespace CoreCms.Net.Web.Admin.Controllers var newPassWord = CommonHelper.Md5For32(entity.password); var userModel = await _sysUserServices.QueryByIdAsync(_user.ID); - if (userModel.passWord != oldPassWord) + if (userModel.passWord.ToUpperInvariant() != oldPassWord) { jm.msg = "旧密码输入错误"; return jm; } - else if (userModel.passWord == newPassWord) + else if (userModel.passWord.ToUpperInvariant() == newPassWord) { jm.msg = "新旧密码一致，无需修改，请设置与旧密码不同的新密码"; return jm; diff --git a/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.css b/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.css index c95e3a0..eaab3ca 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.css +++ b/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.css @@ -68,7 +68,6 @@ a { /*tab切换标题显示字体大小*/ .layui-tab-title li { font-size: 13px; - width: 100px; } /*带标题的栅格线*/ .layui-elem-field legend { diff --git a/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.less b/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.less index 0796a0e..4a2f952 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.less +++ b/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.less @@ -28,7 +28,7 @@ a { cursor: pointer } /*后台快捷方式图标字体大小重写*/ .layadmin-shortcut li cite { font-size: 13px; } /*tab切换标题显示字体大小*/ -.layui-tab-title li { font-size: 13px; width: 100px; } +.layui-tab-title li { font-size: 13px; } /*带标题的栅格线*/ .layui-elem-field legend { font-size: 13px; } diff --git a/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.min.css b/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.min.css index a9a0e76..942b174 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.min.css +++ b/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.min.css @@ -1 +1 @@ -::-webkit-scrollbar{width:6px;height:6px;background-color:#f5f5f5;}::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);border-radius:6px;background-color:#f5f5f5;}::-webkit-scrollbar-thumb{border-radius:6px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);background-color:#009688;}a{cursor:pointer;}.cursor:hover{cursor:pointer;}.layui-nav *{font-size:13.5px;}.layui-breadcrumb>*{font-size:12px;}.layui-input,.layui-textarea{display:block;width:100%;padding-left:5px;}.coreshop-search-form,.layui-table-box,.layui-table-view,.coreshop-form{background-color:#fff;}.layui-side-menu .layui-nav .layui-nav-item .layui-icon{font-size:14px;}.layui-nav-tree .layui-nav-more{right:15px;padding:0;}.table-body{background-color:#fff;margin:10px;padding:0 10px;border:1px solid #e6e6e6;}.layadmin-shortcut li cite{font-size:13px;}.layui-tab-title li{font-size:13px;width:100px;}.layui-elem-field legend{font-size:13px;}.coreshop-form .layui-form-item{margin-bottom:10px;font-size:12px;}.coreshop-form .order-ship-btn{margin:0 auto;margin-top:25px;display:block;}.coreshop-form .layui-btn-fluid{width:50%;}.coreshop-form .layui-tab-content{padding:10px;}.coreshop-form .add-save-btn{width:100%;}.coreshop-form .layui-form-pane .layui-form-label{padding:8px 5px;}.coreshop-form .layui-form-mid{padding:8px 10px !important;border-bottom:1px dashed #eee;min-height:21px;color:#999 !important;}.coreshop-form .layui-form-mid .layui-form-switch{margin-top:-3px;}.coreshop-form .layui-form-label{font-size:12px;}.required-color{color:#f00;}.select-address{display:inline-block !important;width:30%;margin-right:2%;padding:10px 0;border:1px solid #e6e6e6;margin-bottom:0;}.sellect_seller_brands_list li,.sellect_seller_goods_list li{background-color:#f9f9f9;padding:4px;margin:4px;}.sellect_seller_brands_list li span,.sellect_seller_goods_list li span{color:#f00;margin-right:7px;cursor:pointer;}.list-tag{float:right;margin-right:0;}.link-hot{color:#009688;cursor:pointer;}.layui-btn+.layui-btn{margin-left:5px;}.have-add .layui-form-switch,.have-add-td .layui-form-switch{margin-top:0;}.help-tip{float:right;}.icon-wenhao{color:#9e9e9e;font-size:16px !important;position:relative;top:11px;}.layui-iconpicker{margin-bottom:10px;}.layui-field-title{margin:10px 0 10px;}.noDefaultToolbar .layui-table-tool .layui-table-tool-temp{padding-right:0;}.coreshop-toolbar-search-form,.coreshop-search-form{border:1px solid #e6e6e6;padding:10px;margin:10px 10px 0 10px;}.coreshop-toolbar-search-form .layui-input-wrap,.coreshop-search-form .layui-input-wrap{line-height:30px;}.coreshop-toolbar-search-form .layui-input,.coreshop-search-form .layui-input,.coreshop-toolbar-search-form .layui-select,.coreshop-search-form .layui-select,.coreshop-toolbar-search-form .layui-textarea,.coreshop-search-form .layui-textarea{height:30px;line-height:1.3;line-height:30px\9;border-width:1px;border-style:solid;background-color:#fff;border-radius:2px;}.coreshop-toolbar-search-form .layui-form-label,.coreshop-search-form .layui-form-label{float:left;display:block;padding:5px 5px 5px 2px;width:auto;min-width:60px;max-width:120px;font-weight:400;line-height:20px;text-align:center;font-size:12px;}.coreshop-toolbar-search-form .layui-input-block,.coreshop-search-form .layui-input-block{margin-left:74px;min-height:26px;}.coreshop-toolbar-search-form .layui-form-select dl,.coreshop-search-form .layui-form-select dl{top:29px;}.coreshop-toolbar-search-form .layui-form-end-item,.coreshop-search-form .layui-form-end-item{margin-bottom:0;}.coreshop-toolbar-search-form .layui-form-item,.coreshop-search-form .layui-form-item{margin-bottom:0;}.coreshop-toolbar-search-form .layui-form-item .layui-inline,.coreshop-search-form .layui-form-item .layui-inline{margin-bottom:0;margin-right:0;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline{margin-right:5px;width:150px;font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input::-webkit-input-placeholder,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input::-webkit-input-placeholder{font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input::-moz-placeholder,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input::-moz-placeholder{font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input:-ms-input-placeholder,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input:-ms-input-placeholder{font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input:-moz-placeholder,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input:-moz-placeholder{font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .core-time-input,.coreshop-search-form .layui-form-item .layui-inline .core-time-input{width:308px;}.coreshop-toolbar-search-form xm-select,.coreshop-search-form xm-select{min-height:28px;line-height:28px;}.coreshop-toolbar-search-form xm-select *,.coreshop-search-form xm-select *{font-size:12px;}.coreshop-toolbar-search-form .xm-body .xm-tree .xm-option-content,.coreshop-search-form .xm-body .xm-tree .xm-option-content{padding-left:6px;font-size:12px;}.coreshop-toolbar-search-form xm-select .xm-label .scroll .label-content,.coreshop-search-form xm-select .xm-label .scroll .label-content{line-height:28px;}.coreshop-toolbar-search-form xm-select>.xm-label .scroll .label-content,.coreshop-search-form xm-select>.xm-label .scroll .label-content{display:flex;padding:0 20px 0 10px;font-size:12px;}.coreshop-toolbar-search-form .layui-form-mid,.coreshop-search-form .layui-form-mid{padding:4px 0 !important;}.coreshop-toolbar-search-form .layui-input-inline.core-time-input,.coreshop-search-form .layui-input-inline.core-time-input{width:300px;}.coreshop-toolbar-search-form{border:0;padding:0;margin:0;}.order-form .layui-form-item .layui-inline{margin-bottom:5px;margin-right:0;}.order-table .layui-table-tool-temp{padding-right:0;}.order-table table th{padding:0;}.order-table .layui-table-cell{height:auto;line-height:28px;padding:0 5px;position:relative;box-sizing:border-box;}.order-table .layui-table-cell,.order-table .layui-table-tool-panel li{overflow:inherit;text-overflow:ellipsis;white-space:inherit;}.order-table .orderShip{padding:0 5px;}.order-min-table{background:#fafafa;}.order-min-table .layui-table{border-width:1px;border-style:solid;border-color:#eee;}.order-min-table .layui-table th{text-align:center;font-weight:400;}.order-min-table .layui-table tr td{text-align:center;}.order-min-table .layui-table tr td .title{padding:0 5px;}.order-tab-card .layui-tab-title{padding-left:25px;padding-top:5px;}.order-tab-card .layui-tab-title .layui-this:after{border-top:1px solid #eee;}.layui-elem-quote{border-radius:0 2px 2px 0;background-color:#f2f2f2;font-size:12px;padding:10px;}.layui-layout-admin .layui-side{overflow-x:hidden;}.layui-layout-admin .layui-side::-webkit-scrollbar{display:none;}.layui-layout-admin .layui-layer-title{height:40px;line-height:40px;border:0;background-color:#20222a;color:#fff;}.layui-layout-admin i[close]{top:5px;}.layui-layer-admin .layui-layer-title{font-size:13px;}.layui-layer-admin .layui-layer-title{height:40px;line-height:40px;border:0;background-color:#20222a;color:#fff;}.layui-layer-admin i[close]{top:8px;}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn,.layui-layer-dialog .layui-layer-btn{padding-top:10px;}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn{border-top:1px dashed #eee;}.layui-layer-btn .layui-layer-btn0{border-color:#009688;background-color:#009688;color:#fff;}.layui-layer-btn a{height:32px;line-height:32px;padding:0 25px;margin:5px 0 0 10px;border-radius:100px;}.layui-upload-img{height:90px;max-height:90px;width:auto;}.layui-layer-tips .layui-layer-content{position:relative;line-height:22px;min-width:12px;padding:4px 5px;font-size:12px;_float:left;border-radius:2px;box-shadow:1px 1px 3px rgba(0,0,0,.2);background-color:#000;color:#fff;}.layui-badge-green{color:#52c41a;background:#f6ffed;border:1px solid #b7eb8f;}.layui-badge-blue{color:#1890ff;background:#e6f7ff;border:1px solid #91d5ff;}.layui-badge-red{color:#f5222d;background:#fff1f0;border:1px solid #ffa39e;}.layui-badge-yellow{color:#faad14;background:#fffbe6;border:1px solid #ffe58f;}.layui-badge-gray{color:#8c8c8c;background:#fafafa;border:1px solid #ccc;}xm-select>.xm-body{margin-left:-2px;}xm-select>.xm-body .xm-option{background-color:transparent !important;}xm-select>.xm-body .xm-option.hide-icon.selected{background-color:#5fb878 !important;}xm-select>.xm-body .xm-option:hover{background-color:#f2f2f2 !important;}.xm-body .xm-tree{min-width:200px;}.xm-body .xm-tree .xm-option-content{padding-left:6px;}xm-select{border-color:#e6e6e6 !important;}xm-select:hover{border-color:#d2d2d2 !important;}xm-select[style="border-color: rgb(229, 77, 66);"]{border-color:#e54d42 !important;}body .ew-xmselect-tree xm-select .xm-body .xm-option .xm-option-icon{position:absolute;left:30px;top:0;right:0;bottom:0;width:auto;height:auto;border:none !important;z-index:1;}body .ew-xmselect-tree xm-select .xm-body .xm-option .xm-option-icon:before{display:none;}body .ew-xmselect-tree xm-select .xm-body .xm-option.selected{background-color:#f2f2f2 !important;}body .ew-xmselect-tree xm-select .xm-body .xm-option.selected .xm-option-content{color:#5fb878 !important;}xm-select .xm-body .xm-option .xm-option-icon{border-color:#2d8cf0 !important;}xm-select .xm-label .xm-label-block,xm-select .xm-body .xm-option.hide-icon.selected{background-color:#2d8cf0 !important;}.layui-form-required:before{content:"*";display:inline-block;font-family:SimSun;margin-right:4px;font-size:14px;line-height:1;color:#ed4014;}.layui-form-radio *{font-size:12px;}.layui-table td,.layui-table th{position:relative;padding:9px 15px;min-height:20px;line-height:20px;font-size:12px;}.layui-table-cell{height:28px;line-height:28px;padding:0 8px;position:relative;box-sizing:border-box;}.layui-table{word-break:break-all;word-wrap:break-word;}.layui-layer-admin .layui-layer-content{padding:10px;line-height:22px;}.layui-layer-admin .layui-layer-setwin{position:absolute;right:15px;*right:0;top:8px;font-size:0;line-height:initial;}.layui-layer-admin .layui-layer-setwin a{position:relative;width:31px;height:31px;margin-left:10px;font-size:12px;_overflow:hidden;color:#fff;}.layui-layer-admin .layui-layer-setwin .layui-layer-close1{background-position:-149px -31px;cursor:pointer;}.layadmin-header{display:none;height:35px;line-height:35px;margin-bottom:0;border-radius:0;}.layui-btn{font-size:12px;}.ew-crop-img-preview{float:left;margin-bottom:10px;margin-right:15px;overflow:hidden;background:#e6e6e6;}.preview-lg{width:256px;height:144px;}.preview-md{width:128px;height:72px;}.preview-sm{width:64px;height:36px;}.preview-xs{width:32px;height:18px;margin-right:0;}.docs-data{width:100%;float:left;text-align:left;}.myCropperBox .layui-form-label{width:70px;padding:2px 5px;height:25px;line-height:20px;border-width:1px;border-style:solid;border-radius:2px 0 0 2px;text-align:center;background-color:#fbfbfb;overflow:hidden;box-sizing:border-box;}.myCropperBox .layui-form-item{margin-bottom:5px;clear:both;*zoom:1;}.myCropperBox .layui-input{height:25px;line-height:1.3;border-width:1px;border-style:solid;background-color:#fff;}.myCropperBox .layui-input-inline{margin-left:-1px;margin-right:10px;}.myCropperBox .layui-form-mid{float:left;display:block;padding:2px 0 !important;height:25px;line-height:20px;text-align:left;overflow:hidden;box-sizing:border-box;}.addGoods .layui-form-pane xm-select,.editGoodsTypes .layui-form-pane xm-select,.editGoodsParameters .layui-form-pane xm-select{margin:0 -1px -1px 0;}.addGoods .grade_price,.editGoodsTypes .grade_price,.editGoodsParameters .grade_price{width:80% !important;float:left;display:inline;}.addGoods .grade_price input,.editGoodsTypes .grade_price input,.editGoodsParameters .grade_price input{display:inline;width:100px;}.addGoods .spec-item,.editGoodsTypes .spec-item,.editGoodsParameters .spec-item{float:left;margin:5px;}.addGoods .spec-item .layui-form-checkbox,.editGoodsTypes .spec-item .layui-form-checkbox,.editGoodsParameters .spec-item .layui-form-checkbox{margin-top:0 !important;}.addGoods .spec-item .checkboxBox,.editGoodsTypes .spec-item .checkboxBox,.editGoodsParameters .spec-item .checkboxBox{float:left;display:block;line-height:20px;width:75px;}.addGoods .layui-form-pane .layui-form-item[pane] .layui-input-inline,.editGoodsTypes .layui-form-pane .layui-form-item[pane] .layui-input-inline,.editGoodsParameters .layui-form-pane .layui-form-item[pane] .layui-input-inline{margin-left:0;width:auto;}.addGoods .del-img,.editGoodsTypes .del-img,.editGoodsParameters .del-img{position:absolute;background-color:rgba(0,0,0,.5);color:#fff;width:13px;height:13px;line-height:12px;font-size:10px;display:inline-block;text-align:center;border-radius:50%;right:-6px;top:-6px;}.addGoods .w-e-text-container,.editGoodsTypes .w-e-text-container,.editGoodsParameters .w-e-text-container{height:600px !important;}.addGoods .layui-form-text .layui-input-block,.editGoodsTypes .layui-form-text .layui-input-block,.editGoodsParameters .layui-form-text .layui-input-block{margin-left:0;left:0;}.addGoods .imgdiv,.editGoodsTypes .imgdiv,.editGoodsParameters .imgdiv,.transactioncomponent .imgdiv{float:left;text-align:center;border:1px solid #ccc;padding:5px;padding-bottom:0;margin-right:10px;background-color:#fff;}.addGoods .layui-upload-img,.editGoodsTypes .layui-upload-img,.editGoodsParameters .layui-upload-img,.transactioncomponent .layui-upload-img{margin:0;}.addGoods .layui-upload-list,.editGoodsTypes .layui-upload-list,.editGoodsParameters .layui-upload-list,.transactioncomponent .layui-upload-list{margin:10px 0;overflow:hidden;}.addGoods .spec_image,.editGoodsTypes .spec_image,.editGoodsParameters .spec_image,.transactioncomponent .spec_image{display:inline-block;}.addGoods .spec_image_item,.editGoodsTypes .spec_image_item,.editGoodsParameters .spec_image_item,.transactioncomponent .spec_image_item{position:relative;display:inline-block;}#parametersBox .layui-form-item{background:#fff;}.text-right{text-align:right;}.text-center{text-align:center;}.text-left{text-align:left;}.core-hidden{display:none;}.core-show{display:block;}.float-left{float:left !important;}.float-right{float:right !important;}.float-none{float:none !important;}.text-red,.line-red,.lines-red{color:#e54d42;}.text-orange,.line-orange,.lines-orange{color:#f37b1d;}.text-yellow,.line-yellow,.lines-yellow{color:#fbbd08;}.text-olive,.line-olive,.lines-olive{color:#8dc63f;}.text-green,.line-green,.lines-green{color:#39b54a;}.text-cyan,.line-cyan,.lines-cyan{color:#1cbbb4;}.text-blue,.line-blue,.lines-blue{color:#0081ff;}.text-purple,.line-purple,.lines-purple{color:#6739b6;}.text-mauve,.line-mauve,.lines-mauve{color:#9c26b0;}.text-pink,.line-pink,.lines-pink{color:#e03997;}.text-brown,.line-brown,.lines-brown{color:#a5673f;}.text-grey,.line-grey,.lines-grey{color:#8799a3;}.text-gray,.line-gray,.lines-gray{color:#aaa;}.text-black,.line-black,.lines-black{color:#333;}.text-white,.line-white,.lines-white{color:#fff;}.layui-form-item .layui-inline-1{width:50px;}.layui-form-item .layui-inline-2{width:100px;}.layui-form-item .layui-inline-3{width:150px;}.layui-form-item .layui-inline-4{width:200px;}.layui-form-item .layui-inline-5{width:250px;}.layui-form-item .layui-inline-6{width:300px;}.layui-form-item .layui-inline-7{width:350px;}.layui-form-item .layui-inline-8{width:400px;}.layui-form-item .layui-inline-9{width:450px;}.layui-form-item .layui-inline-10{width:500px;}.layui-form-item .layui-inline-11{width:550px;}.layui-form-item .layui-inline-12{width:600px;}.layui-form-item .layui-inline-13{width:650px;}.layui-form-item .layui-inline-14{width:700px;}.layui-form-item .layui-inline-100{width:calc(100% - 110px - 20px - 10px);padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-1{width:20px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-2{width:80px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-3{width:130px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-4{width:180px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-5{width:230px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-6{width:280px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-7{width:330px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-8{width:380px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-9{width:430px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-10{width:480px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-11{width:530px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-12{width:580px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-13{width:630px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-14{width:680px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-100{width:calc(100% - 110px - 20px - 10px);padding:0 10px;}.coreshop-nav-tree .layui-nav-more{right:15px;padding:0;}.coreshop-nav-tree .layui-nav-item>a{height:45px;line-height:45px;}.coreshop-nav-tree .layui-nav-item a cite{letter-spacing:2px;font-size:13.5px;}.coreshop-nav-tree .layui-icon{font-size:13px;}.coreshop-nav-tree .layui-nav-item .layui-icon:first-child{position:absolute;top:50%;left:20px;margin-top:-24px;}.coreshop-admin .layui-logo{padding:0;}.coreshop-admin .layui-logo span{font-size:21px;font-weight:550;letter-spacing:5px;}.coreshop-upload-img{height:37px;max-height:37px;width:auto;margin:0 8px 0 0;}.productBox .layui-table td,.productBox .layui-table th{padding:9px 5px;text-align:center;}.productBox .layui-input,.productBox .layui-select,.productBox .layui-textarea{height:28px;}.pagebarbox .layui-table-page{text-align:right;}.pagebarbox .layui-table-pagebar{float:left;}.longLogo{height:50px;width:220px;display:block;}.layadmin-side-shrink .longLogo{height:50px;width:220px;display:none;}.layadmin-side-shrink .layui-layout-admin .layui-logo{width:60px;background-image:url(../images/common/logoMin.png);} \ No newline at end of file +::-webkit-scrollbar{width:6px;height:6px;background-color:#f5f5f5;}::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);border-radius:6px;background-color:#f5f5f5;}::-webkit-scrollbar-thumb{border-radius:6px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);background-color:#009688;}a{cursor:pointer;}.cursor:hover{cursor:pointer;}.layui-nav *{font-size:13.5px;}.layui-breadcrumb>*{font-size:12px;}.layui-input,.layui-textarea{display:block;width:100%;padding-left:5px;}.coreshop-search-form,.layui-table-box,.layui-table-view,.coreshop-form{background-color:#fff;}.layui-side-menu .layui-nav .layui-nav-item .layui-icon{font-size:14px;}.layui-nav-tree .layui-nav-more{right:15px;padding:0;}.table-body{background-color:#fff;margin:10px;padding:0 10px;border:1px solid #e6e6e6;}.layadmin-shortcut li cite{font-size:13px;}.layui-tab-title li{font-size:13px;}.layui-elem-field legend{font-size:13px;}.coreshop-form .layui-form-item{margin-bottom:10px;font-size:12px;}.coreshop-form .order-ship-btn{margin:0 auto;margin-top:25px;display:block;}.coreshop-form .layui-btn-fluid{width:50%;}.coreshop-form .layui-tab-content{padding:10px;}.coreshop-form .add-save-btn{width:100%;}.coreshop-form .layui-form-pane .layui-form-label{padding:8px 5px;}.coreshop-form .layui-form-mid{padding:8px 10px !important;border-bottom:1px dashed #eee;min-height:21px;color:#999 !important;}.coreshop-form .layui-form-mid .layui-form-switch{margin-top:-3px;}.coreshop-form .layui-form-label{font-size:12px;}.required-color{color:#f00;}.select-address{display:inline-block !important;width:30%;margin-right:2%;padding:10px 0;border:1px solid #e6e6e6;margin-bottom:0;}.sellect_seller_brands_list li,.sellect_seller_goods_list li{background-color:#f9f9f9;padding:4px;margin:4px;}.sellect_seller_brands_list li span,.sellect_seller_goods_list li span{color:#f00;margin-right:7px;cursor:pointer;}.list-tag{float:right;margin-right:0;}.link-hot{color:#009688;cursor:pointer;}.layui-btn+.layui-btn{margin-left:5px;}.have-add .layui-form-switch,.have-add-td .layui-form-switch{margin-top:0;}.help-tip{float:right;}.icon-wenhao{color:#9e9e9e;font-size:16px !important;position:relative;top:11px;}.layui-iconpicker{margin-bottom:10px;}.layui-field-title{margin:10px 0 10px;}.noDefaultToolbar .layui-table-tool .layui-table-tool-temp{padding-right:0;}.coreshop-toolbar-search-form,.coreshop-search-form{border:1px solid #e6e6e6;padding:10px;margin:10px 10px 0 10px;}.coreshop-toolbar-search-form .layui-input-wrap,.coreshop-search-form .layui-input-wrap{line-height:30px;}.coreshop-toolbar-search-form .layui-input,.coreshop-search-form .layui-input,.coreshop-toolbar-search-form .layui-select,.coreshop-search-form .layui-select,.coreshop-toolbar-search-form .layui-textarea,.coreshop-search-form .layui-textarea{height:30px;line-height:1.3;line-height:30px\9;border-width:1px;border-style:solid;background-color:#fff;border-radius:2px;}.coreshop-toolbar-search-form .layui-form-label,.coreshop-search-form .layui-form-label{float:left;display:block;padding:5px 5px 5px 2px;width:auto;min-width:60px;max-width:120px;font-weight:400;line-height:20px;text-align:center;font-size:12px;}.coreshop-toolbar-search-form .layui-input-block,.coreshop-search-form .layui-input-block{margin-left:74px;min-height:26px;}.coreshop-toolbar-search-form .layui-form-select dl,.coreshop-search-form .layui-form-select dl{top:29px;}.coreshop-toolbar-search-form .layui-form-end-item,.coreshop-search-form .layui-form-end-item{margin-bottom:0;}.coreshop-toolbar-search-form .layui-form-item,.coreshop-search-form .layui-form-item{margin-bottom:0;}.coreshop-toolbar-search-form .layui-form-item .layui-inline,.coreshop-search-form .layui-form-item .layui-inline{margin-bottom:0;margin-right:0;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline{margin-right:5px;width:150px;font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input::-webkit-input-placeholder,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input::-webkit-input-placeholder{font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input::-moz-placeholder,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input::-moz-placeholder{font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input:-ms-input-placeholder,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input:-ms-input-placeholder{font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input:-moz-placeholder,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input:-moz-placeholder{font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .core-time-input,.coreshop-search-form .layui-form-item .layui-inline .core-time-input{width:308px;}.coreshop-toolbar-search-form xm-select,.coreshop-search-form xm-select{min-height:28px;line-height:28px;}.coreshop-toolbar-search-form xm-select *,.coreshop-search-form xm-select *{font-size:12px;}.coreshop-toolbar-search-form .xm-body .xm-tree .xm-option-content,.coreshop-search-form .xm-body .xm-tree .xm-option-content{padding-left:6px;font-size:12px;}.coreshop-toolbar-search-form xm-select .xm-label .scroll .label-content,.coreshop-search-form xm-select .xm-label .scroll .label-content{line-height:28px;}.coreshop-toolbar-search-form xm-select>.xm-label .scroll .label-content,.coreshop-search-form xm-select>.xm-label .scroll .label-content{display:flex;padding:0 20px 0 10px;font-size:12px;}.coreshop-toolbar-search-form .layui-form-mid,.coreshop-search-form .layui-form-mid{padding:4px 0 !important;}.coreshop-toolbar-search-form .layui-input-inline.core-time-input,.coreshop-search-form .layui-input-inline.core-time-input{width:300px;}.coreshop-toolbar-search-form{border:0;padding:0;margin:0;}.order-form .layui-form-item .layui-inline{margin-bottom:5px;margin-right:0;}.order-table .layui-table-tool-temp{padding-right:0;}.order-table table th{padding:0;}.order-table .layui-table-cell{height:auto;line-height:28px;padding:0 5px;position:relative;box-sizing:border-box;}.order-table .layui-table-cell,.order-table .layui-table-tool-panel li{overflow:inherit;text-overflow:ellipsis;white-space:inherit;}.order-table .orderShip{padding:0 5px;}.order-min-table{background:#fafafa;}.order-min-table .layui-table{border-width:1px;border-style:solid;border-color:#eee;}.order-min-table .layui-table th{text-align:center;font-weight:400;}.order-min-table .layui-table tr td{text-align:center;}.order-min-table .layui-table tr td .title{padding:0 5px;}.order-tab-card .layui-tab-title{padding-left:25px;padding-top:5px;}.order-tab-card .layui-tab-title .layui-this:after{border-top:1px solid #eee;}.layui-elem-quote{border-radius:0 2px 2px 0;background-color:#f2f2f2;font-size:12px;padding:10px;}.layui-layout-admin .layui-side{overflow-x:hidden;}.layui-layout-admin .layui-side::-webkit-scrollbar{display:none;}.layui-layout-admin .layui-layer-title{height:40px;line-height:40px;border:0;background-color:#20222a;color:#fff;}.layui-layout-admin i[close]{top:5px;}.layui-layer-admin .layui-layer-title{font-size:13px;}.layui-layer-admin .layui-layer-title{height:40px;line-height:40px;border:0;background-color:#20222a;color:#fff;}.layui-layer-admin i[close]{top:8px;}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn,.layui-layer-dialog .layui-layer-btn{padding-top:10px;}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn{border-top:1px dashed #eee;}.layui-layer-btn .layui-layer-btn0{border-color:#009688;background-color:#009688;color:#fff;}.layui-layer-btn a{height:32px;line-height:32px;padding:0 25px;margin:5px 0 0 10px;border-radius:100px;}.layui-upload-img{height:90px;max-height:90px;width:auto;}.layui-layer-tips .layui-layer-content{position:relative;line-height:22px;min-width:12px;padding:4px 5px;font-size:12px;_float:left;border-radius:2px;box-shadow:1px 1px 3px rgba(0,0,0,.2);background-color:#000;color:#fff;}.layui-badge-green{color:#52c41a;background:#f6ffed;border:1px solid #b7eb8f;}.layui-badge-blue{color:#1890ff;background:#e6f7ff;border:1px solid #91d5ff;}.layui-badge-red{color:#f5222d;background:#fff1f0;border:1px solid #ffa39e;}.layui-badge-yellow{color:#faad14;background:#fffbe6;border:1px solid #ffe58f;}.layui-badge-gray{color:#8c8c8c;background:#fafafa;border:1px solid #ccc;}xm-select>.xm-body{margin-left:-2px;}xm-select>.xm-body .xm-option{background-color:transparent !important;}xm-select>.xm-body .xm-option.hide-icon.selected{background-color:#5fb878 !important;}xm-select>.xm-body .xm-option:hover{background-color:#f2f2f2 !important;}.xm-body .xm-tree{min-width:200px;}.xm-body .xm-tree .xm-option-content{padding-left:6px;}xm-select{border-color:#e6e6e6 !important;}xm-select:hover{border-color:#d2d2d2 !important;}xm-select[style="border-color: rgb(229, 77, 66);"]{border-color:#e54d42 !important;}body .ew-xmselect-tree xm-select .xm-body .xm-option .xm-option-icon{position:absolute;left:30px;top:0;right:0;bottom:0;width:auto;height:auto;border:none !important;z-index:1;}body .ew-xmselect-tree xm-select .xm-body .xm-option .xm-option-icon:before{display:none;}body .ew-xmselect-tree xm-select .xm-body .xm-option.selected{background-color:#f2f2f2 !important;}body .ew-xmselect-tree xm-select .xm-body .xm-option.selected .xm-option-content{color:#5fb878 !important;}xm-select .xm-body .xm-option .xm-option-icon{border-color:#2d8cf0 !important;}xm-select .xm-label .xm-label-block,xm-select .xm-body .xm-option.hide-icon.selected{background-color:#2d8cf0 !important;}.layui-form-required:before{content:"*";display:inline-block;font-family:SimSun;margin-right:4px;font-size:14px;line-height:1;color:#ed4014;}.layui-form-radio *{font-size:12px;}.layui-table td,.layui-table th{position:relative;padding:9px 15px;min-height:20px;line-height:20px;font-size:12px;}.layui-table-cell{height:28px;line-height:28px;padding:0 8px;position:relative;box-sizing:border-box;}.layui-table{word-break:break-all;word-wrap:break-word;}.layui-layer-admin .layui-layer-content{padding:10px;line-height:22px;}.layui-layer-admin .layui-layer-setwin{position:absolute;right:15px;*right:0;top:8px;font-size:0;line-height:initial;}.layui-layer-admin .layui-layer-setwin a{position:relative;width:31px;height:31px;margin-left:10px;font-size:12px;_overflow:hidden;color:#fff;}.layui-layer-admin .layui-layer-setwin .layui-layer-close1{background-position:-149px -31px;cursor:pointer;}.layadmin-header{display:none;height:35px;line-height:35px;margin-bottom:0;border-radius:0;}.layui-btn{font-size:12px;}.ew-crop-img-preview{float:left;margin-bottom:10px;margin-right:15px;overflow:hidden;background:#e6e6e6;}.preview-lg{width:256px;height:144px;}.preview-md{width:128px;height:72px;}.preview-sm{width:64px;height:36px;}.preview-xs{width:32px;height:18px;margin-right:0;}.docs-data{width:100%;float:left;text-align:left;}.myCropperBox .layui-form-label{width:70px;padding:2px 5px;height:25px;line-height:20px;border-width:1px;border-style:solid;border-radius:2px 0 0 2px;text-align:center;background-color:#fbfbfb;overflow:hidden;box-sizing:border-box;}.myCropperBox .layui-form-item{margin-bottom:5px;clear:both;*zoom:1;}.myCropperBox .layui-input{height:25px;line-height:1.3;border-width:1px;border-style:solid;background-color:#fff;}.myCropperBox .layui-input-inline{margin-left:-1px;margin-right:10px;}.myCropperBox .layui-form-mid{float:left;display:block;padding:2px 0 !important;height:25px;line-height:20px;text-align:left;overflow:hidden;box-sizing:border-box;}.addGoods .layui-form-pane xm-select,.editGoodsTypes .layui-form-pane xm-select,.editGoodsParameters .layui-form-pane xm-select{margin:0 -1px -1px 0;}.addGoods .grade_price,.editGoodsTypes .grade_price,.editGoodsParameters .grade_price{width:80% !important;float:left;display:inline;}.addGoods .grade_price input,.editGoodsTypes .grade_price input,.editGoodsParameters .grade_price input{display:inline;width:100px;}.addGoods .spec-item,.editGoodsTypes .spec-item,.editGoodsParameters .spec-item{float:left;margin:5px;}.addGoods .spec-item .layui-form-checkbox,.editGoodsTypes .spec-item .layui-form-checkbox,.editGoodsParameters .spec-item .layui-form-checkbox{margin-top:0 !important;}.addGoods .spec-item .checkboxBox,.editGoodsTypes .spec-item .checkboxBox,.editGoodsParameters .spec-item .checkboxBox{float:left;display:block;line-height:20px;width:75px;}.addGoods .layui-form-pane .layui-form-item[pane] .layui-input-inline,.editGoodsTypes .layui-form-pane .layui-form-item[pane] .layui-input-inline,.editGoodsParameters .layui-form-pane .layui-form-item[pane] .layui-input-inline{margin-left:0;width:auto;}.addGoods .del-img,.editGoodsTypes .del-img,.editGoodsParameters .del-img{position:absolute;background-color:rgba(0,0,0,.5);color:#fff;width:13px;height:13px;line-height:12px;font-size:10px;display:inline-block;text-align:center;border-radius:50%;right:-6px;top:-6px;}.addGoods .w-e-text-container,.editGoodsTypes .w-e-text-container,.editGoodsParameters .w-e-text-container{height:600px !important;}.addGoods .layui-form-text .layui-input-block,.editGoodsTypes .layui-form-text .layui-input-block,.editGoodsParameters .layui-form-text .layui-input-block{margin-left:0;left:0;}.addGoods .imgdiv,.editGoodsTypes .imgdiv,.editGoodsParameters .imgdiv,.transactioncomponent .imgdiv{float:left;text-align:center;border:1px solid #ccc;padding:5px;padding-bottom:0;margin-right:10px;background-color:#fff;}.addGoods .layui-upload-img,.editGoodsTypes .layui-upload-img,.editGoodsParameters .layui-upload-img,.transactioncomponent .layui-upload-img{margin:0;}.addGoods .layui-upload-list,.editGoodsTypes .layui-upload-list,.editGoodsParameters .layui-upload-list,.transactioncomponent .layui-upload-list{margin:10px 0;overflow:hidden;}.addGoods .spec_image,.editGoodsTypes .spec_image,.editGoodsParameters .spec_image,.transactioncomponent .spec_image{display:inline-block;}.addGoods .spec_image_item,.editGoodsTypes .spec_image_item,.editGoodsParameters .spec_image_item,.transactioncomponent .spec_image_item{position:relative;display:inline-block;}#parametersBox .layui-form-item{background:#fff;}.text-right{text-align:right;}.text-center{text-align:center;}.text-left{text-align:left;}.core-hidden{display:none;}.core-show{display:block;}.float-left{float:left !important;}.float-right{float:right !important;}.float-none{float:none !important;}.text-red,.line-red,.lines-red{color:#e54d42;}.text-orange,.line-orange,.lines-orange{color:#f37b1d;}.text-yellow,.line-yellow,.lines-yellow{color:#fbbd08;}.text-olive,.line-olive,.lines-olive{color:#8dc63f;}.text-green,.line-green,.lines-green{color:#39b54a;}.text-cyan,.line-cyan,.lines-cyan{color:#1cbbb4;}.text-blue,.line-blue,.lines-blue{color:#0081ff;}.text-purple,.line-purple,.lines-purple{color:#6739b6;}.text-mauve,.line-mauve,.lines-mauve{color:#9c26b0;}.text-pink,.line-pink,.lines-pink{color:#e03997;}.text-brown,.line-brown,.lines-brown{color:#a5673f;}.text-grey,.line-grey,.lines-grey{color:#8799a3;}.text-gray,.line-gray,.lines-gray{color:#aaa;}.text-black,.line-black,.lines-black{color:#333;}.text-white,.line-white,.lines-white{color:#fff;}.layui-form-item .layui-inline-1{width:50px;}.layui-form-item .layui-inline-2{width:100px;}.layui-form-item .layui-inline-3{width:150px;}.layui-form-item .layui-inline-4{width:200px;}.layui-form-item .layui-inline-5{width:250px;}.layui-form-item .layui-inline-6{width:300px;}.layui-form-item .layui-inline-7{width:350px;}.layui-form-item .layui-inline-8{width:400px;}.layui-form-item .layui-inline-9{width:450px;}.layui-form-item .layui-inline-10{width:500px;}.layui-form-item .layui-inline-11{width:550px;}.layui-form-item .layui-inline-12{width:600px;}.layui-form-item .layui-inline-13{width:650px;}.layui-form-item .layui-inline-14{width:700px;}.layui-form-item .layui-inline-100{width:calc(100% - 110px - 20px - 10px);padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-1{width:20px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-2{width:80px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-3{width:130px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-4{width:180px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-5{width:230px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-6{width:280px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-7{width:330px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-8{width:380px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-9{width:430px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-10{width:480px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-11{width:530px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-12{width:580px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-13{width:630px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-14{width:680px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-100{width:calc(100% - 110px - 20px - 10px);padding:0 10px;}.coreshop-nav-tree .layui-nav-more{right:15px;padding:0;}.coreshop-nav-tree .layui-nav-item>a{height:45px;line-height:45px;}.coreshop-nav-tree .layui-nav-item a cite{letter-spacing:2px;font-size:13.5px;}.coreshop-nav-tree .layui-icon{font-size:13px;}.coreshop-nav-tree .layui-nav-item .layui-icon:first-child{position:absolute;top:50%;left:20px;margin-top:-24px;}.coreshop-admin .layui-logo{padding:0;}.coreshop-admin .layui-logo span{font-size:21px;font-weight:550;letter-spacing:5px;}.coreshop-upload-img{height:37px;max-height:37px;width:auto;margin:0 8px 0 0;}.productBox .layui-table td,.productBox .layui-table th{padding:9px 5px;text-align:center;}.productBox .layui-input,.productBox .layui-select,.productBox .layui-textarea{height:28px;}.pagebarbox .layui-table-page{text-align:right;}.pagebarbox .layui-table-pagebar{float:left;}.longLogo{height:50px;width:220px;display:block;}.layadmin-side-shrink .longLogo{height:50px;width:220px;display:none;}.layadmin-side-shrink .layui-layout-admin .layui-logo{width:60px;background-image:url(../images/common/logoMin.png);} \ No newline at end of file -- Gitee From 0a76ad82cba3d1d0f08e949c0f9f132400e0241d Mon Sep 17 00:00:00 2001 From: JianWeie Date: Tue, 30 Nov 2021 23:10:33 +0800 Subject: [PATCH 3/6] =?UTF-8?q?##=201.2.3=EF=BC=882021-11-30=EF=BC=89=20?= =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8Duview1.8.?= =?UTF-8?q?4=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=AF=8C=E6=96=87=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E5=9B=BE=E7=89=87=E4=B9=8B=E9=97=B4=E6=9C=89=E7=99=BD?= =?UTF-8?q?=E8=89=B2=E9=97=B4=E9=9A=94=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=A4=9A=E5=BC=A0=E5=88=86=E5=89=B2=E5=9B=BE=E4=B8=8D?= =?UTF-8?q?=E8=A1=94=E6=8E=A5=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82#I4KE6N?= =?UTF-8?q?=20=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E6=9C=AA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=A0=87=E5=87=86=E8=A1=A8=E5=8D=95=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=97=A0=E9=AA=8C=E8=AF=81=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?=E6=84=9F=E8=B0=A2=E3=80=90=E5=8C=BF=E5=90=8D=E8=80=85QQ:674850?= =?UTF-8?q?024=E3=80=91=E5=8F=91=E7=8E=B0=E6=AD=A4=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Auth/Policys/PermissionForAdminHandler.cs | 7 ++++++- CoreCms.Net.Auth/Policys/PermissionForClientHandler.cs | 7 ++++++- .../CoreShop/uview-ui/components/u-parse/libs/trees.vue | 2 +- CoreCms.Net.Web.Admin/Doc.xml | 2 +- CoreCms.Net.Web.WebApi/Doc.xml | 8 +++++++- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/CoreCms.Net.Auth/Policys/PermissionForAdminHandler.cs b/CoreCms.Net.Auth/Policys/PermissionForAdminHandler.cs index 61c5a64..3538be4 100644 --- a/CoreCms.Net.Auth/Policys/PermissionForAdminHandler.cs +++ b/CoreCms.Net.Auth/Policys/PermissionForAdminHandler.cs @@ -186,8 +186,13 @@ namespace CoreCms.Net.Auth.Policys return; } } + else + { + context.Fail(); + return; + } //判断没有登录时，是否访问登录的url,并且是Post请求，并且是form表单提交类型，否则为失败 - if (!questUrl.Equals(requirement.LoginPath.ToLower(), StringComparison.Ordinal) && (!httpContext.Request.Method.Equals("POST") || !httpContext.Request.HasFormContentType)) + if (!questUrl.Equals(requirement.LoginPath.ToLower(), StringComparison.Ordinal) && (!httpContext.Request.Method.Equals("POST") || !httpContext.Request.HasJsonContentType())) { context.Fail(); return; diff --git a/CoreCms.Net.Auth/Policys/PermissionForClientHandler.cs b/CoreCms.Net.Auth/Policys/PermissionForClientHandler.cs index 51976c7..6f9c383 100644 --- a/CoreCms.Net.Auth/Policys/PermissionForClientHandler.cs +++ b/CoreCms.Net.Auth/Policys/PermissionForClientHandler.cs @@ -158,8 +158,13 @@ namespace CoreCms.Net.Auth.Policys return; } } + else + { + context.Fail(); + return; + } //判断没有登录时，是否访问登录的url,并且是Post请求，并且是form表单提交类型，否则为失败 - if (!questUrl.Equals(requirement.LoginPath.ToLower(), StringComparison.Ordinal) && (!httpContext.Request.Method.Equals("POST") || !httpContext.Request.HasFormContentType)) + if (!questUrl.Equals(requirement.LoginPath.ToLower(), StringComparison.Ordinal) && (!httpContext.Request.Method.Equals("POST") || !httpContext.Request.HasJsonContentType())) { context.Fail(); return; diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-parse/libs/trees.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-parse/libs/trees.vue index 2b24820..3ecb6d7 100644 --- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-parse/libs/trees.vue +++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-parse/libs/trees.vue @@ -301,7 +301,7 @@ } ._img { - display: inline-block; + /*display: inline-block;*/ max-width: 100%; overflow: hidden; } diff --git a/CoreCms.Net.Web.Admin/Doc.xml b/CoreCms.Net.Web.Admin/Doc.xml index d1572d8..1c46180 100644 --- a/CoreCms.Net.Web.Admin/Doc.xml +++ b/CoreCms.Net.Web.Admin/Doc.xml @@ -554,7 +554,7 @@ 后端常用方法 - + 构造函数 diff --git a/CoreCms.Net.Web.WebApi/Doc.xml b/CoreCms.Net.Web.WebApi/Doc.xml index c88437d..ea32627 100644 --- a/CoreCms.Net.Web.WebApi/Doc.xml +++ b/CoreCms.Net.Web.WebApi/Doc.xml @@ -181,7 +181,7 @@ 通用调用接口数据 - + 构造函数 @@ -821,6 +821,12 @@ + + + 搜索订单 + + + 店铺提货单列表 -- Gitee From 21cb0c078fd43b089196c03c6636cf594fca03e3 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Mon, 6 Dec 2021 14:13:16 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E4=BA=A4=E6=B5=81=E7=BE=A4=E4=BA=8C=E7=BB=B4=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E4=B8=8D=E4=BD=BF=E7=94=A8QQ=E7=9A=84?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B2=9F=E9=80=9A=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 3355d6e..228e858 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,11 @@ QQ群：70494974 [![](https://img.shields.io/badge/点击访问官方网站-coreshop.cn-brightgreen)](https://www.coreshop.cn/) [![](https://img.shields.io/badge/点击加QQ群-70494974-red)](https://jq.qq.com/?_wv=1027&k=y83TiQC7) +

+ wechat +

+ + ------------------------------------------------------------------------ -- Gitee From d08a27530abbc02574991e416da3c53325ab88f5 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Mon, 6 Dec 2021 14:18:27 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E4=BA=A4=E6=B5=81=E7=BE=A4=E4=BA=8C=E7=BB=B4=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E4=B8=8D=E4=BD=BF=E7=94=A8QQ=E7=9A=84?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B2=9F=E9=80=9A=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 228e858..0022eb5 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ QQ群：70494974 [![](https://img.shields.io/badge/点击访问官方网站-coreshop.cn-brightgreen)](https://www.coreshop.cn/) [![](https://img.shields.io/badge/点击加QQ群-70494974-red)](https://jq.qq.com/?_wv=1027&k=y83TiQC7)

- wechat + wechat

-- Gitee From ced32d7034365039f9e7591112c9c5bf7bea42a4 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Tue, 7 Dec 2021 00:43:54 +0800 Subject: [PATCH 6/6] =?UTF-8?q?##=201.2.4=EF=BC=882021-12-06=EF=BC=89=20?= =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E5=88=86?= =?UTF-8?q?=E9=94=80=E8=AE=BE=E7=BD=AE=E6=88=90=E4=B8=BA=E5=88=86=E9=94=80?= =?UTF-8?q?=E5=95=86=E7=9A=84=E6=9D=A1=E4=BB=B6=E4=B8=BA=E3=80=90=E6=97=A0?= =?UTF-8?q?=E9=9C=80=E5=AE=A1=E6=A0=B8=E3=80=91=E4=BD=86=E4=B8=8D=E7=94=9F?= =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82#I4LA2A=20?= =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E5=8F=96=E6=B6=88=E6=9C=AA?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E9=AA=8C=E8=AF=81=E5=8F=AF=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E9=AA=8C=E8=AF=81=E6=A8=A1=E5=BC=8F=E3=80=82#I4L198?= =?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=89=8D=E7=AB=AFcoreshop.vue=E9=A1=B5=E9=9D=A2=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E4=B8=BAgb=E9=97=AE=E9=A2=98=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=BAutf-8=E3=80=82#I4L0YR=20=E3=80=90=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E5=88=A4=E6=96=AD=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=98=AF=E5=90=A6=E5=8F=82=E5=8A=A0=E5=9B=A2=E8=B4=AD?= =?UTF-8?q?=E6=88=96=E8=80=85=E7=A7=92=E6=9D=80=E7=9A=84=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E8=BF=90=E7=AE=97=E7=AC=A6=E4=BD=BF=E7=94=A8=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82#I4KZ1K=20=E3=80=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E5=9B=A0=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E8=AF=81?= =?UTF-8?q?=E4=B9=A6=E8=B7=AF=E5=BE=84windows=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E4=B8=8Elinux=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=9C=89=E5=B7=AE?= =?UTF-8?q?=E5=BC=82=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=A4=BA=E4=BE=8B=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E3=80=82#I4KVWL=20=E3=80=90=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E3=80=91=E8=B0=83=E6=95=B4=E7=9F=AD=E4=BF=A1=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=A8=A1=E6=9D=BF=E6=A0=B7=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=AF=E5=90=8E=E5=8F=B0=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E7=9F=AD=E4=BF=A1=E5=8F=91=E9=80=81=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E3=80=82#I4KLK1=20=E3=80=90=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E5=85=A8=E5=B1=80=E4=BF=83?= =?UTF-8?q?=E9=94=80=E5=A6=82=E6=9E=9C=E4=BF=83=E9=94=80=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E4=B8=BA=E5=B0=8F=E6=95=B0=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?#I4L9H6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Policys/PermissionForAdminHandler.cs | 15 ++- .../Policys/PermissionForClientHandler.cs | 15 ++- CoreCms.Net.Configuration/GlobalEnumVars.cs | 23 ++++ .../SystemSettingConstVars.cs | 55 +++++++++ .../SystemSettingDictionary.cs | 13 +++ .../CoreCmsDistributionOrderServices.cs | 2 +- .../CoreCmsDistributionServices.cs | 10 +- .../Good/CoreCmsGoodsServices.cs | 3 +- .../Message/CoreCmsSmsServices.cs | 106 +++++++++++++++++- .../CoreCmsPromotionResultServices.cs | 10 +- .../components/coreshop-page/coreshop.vue | 42 +++---- CoreCms.Net.Web.Admin/appsettings.json | 1 + .../views/shop/message/smssetting/index.html | 99 ++++++++++++++++ CoreCms.Net.Web.WebApi/appsettings.json | 1 + 14 files changed, 355 insertions(+), 40 deletions(-) diff --git a/CoreCms.Net.Auth/Policys/PermissionForAdminHandler.cs b/CoreCms.Net.Auth/Policys/PermissionForAdminHandler.cs index 3538be4..b3cd0da 100644 --- a/CoreCms.Net.Auth/Policys/PermissionForAdminHandler.cs +++ b/CoreCms.Net.Auth/Policys/PermissionForAdminHandler.cs @@ -185,6 +185,11 @@ namespace CoreCms.Net.Auth.Policys } return; } + else + { + context.Fail(); + return; + } } else { @@ -192,11 +197,11 @@ namespace CoreCms.Net.Auth.Policys return; } //判断没有登录时，是否访问登录的url,并且是Post请求，并且是form表单提交类型，否则为失败 - if (!questUrl.Equals(requirement.LoginPath.ToLower(), StringComparison.Ordinal) && (!httpContext.Request.Method.Equals("POST") || !httpContext.Request.HasJsonContentType())) - { - context.Fail(); - return; - } + //if (!questUrl.Equals(requirement.LoginPath.ToLower(), StringComparison.Ordinal) && (!httpContext.Request.Method.Equals("POST") || !httpContext.Request.HasJsonContentType())) + //{ + // context.Fail(); + // return; + //} } context.Succeed(requirement); diff --git a/CoreCms.Net.Auth/Policys/PermissionForClientHandler.cs b/CoreCms.Net.Auth/Policys/PermissionForClientHandler.cs index 6f9c383..1a878c2 100644 --- a/CoreCms.Net.Auth/Policys/PermissionForClientHandler.cs +++ b/CoreCms.Net.Auth/Policys/PermissionForClientHandler.cs @@ -157,6 +157,11 @@ namespace CoreCms.Net.Auth.Policys } return; } + else + { + context.Fail(); + return; + } } else { @@ -164,11 +169,11 @@ namespace CoreCms.Net.Auth.Policys return; } //判断没有登录时，是否访问登录的url,并且是Post请求，并且是form表单提交类型，否则为失败 - if (!questUrl.Equals(requirement.LoginPath.ToLower(), StringComparison.Ordinal) && (!httpContext.Request.Method.Equals("POST") || !httpContext.Request.HasJsonContentType())) - { - context.Fail(); - return; - } + //if (!questUrl.Equals(requirement.LoginPath.ToLower(), StringComparison.Ordinal) && (!httpContext.Request.Method.Equals("POST") || !httpContext.Request.HasJsonContentType())) + //{ + // context.Fail(); + // return; + //} } context.Succeed(requirement); diff --git a/CoreCms.Net.Configuration/GlobalEnumVars.cs b/CoreCms.Net.Configuration/GlobalEnumVars.cs index c2f2506..52f7fdd 100644 --- a/CoreCms.Net.Configuration/GlobalEnumVars.cs +++ b/CoreCms.Net.Configuration/GlobalEnumVars.cs @@ -2264,6 +2264,29 @@ namespace CoreCms.Net.Configuration COMMISSION_TYPE_FIXED = 2, } + /// + /// 成为分销商条件 + /// + public enum DistributionConditionType + { + + /// + /// 无条件（需审核） + /// + [Description("无条件（需审核）")] + Unconditional = 1, + /// + /// 申请（需审核） + /// + [Description("申请（需审核）")] + Apply = 2, + /// + /// 无需审核 + /// + [Description("无需审核")] + NoReview = 3, + } + #endregion #region 快递100api接口相关=================== diff --git a/CoreCms.Net.Configuration/SystemSettingConstVars.cs b/CoreCms.Net.Configuration/SystemSettingConstVars.cs index 15edd24..c0dc81a 100644 --- a/CoreCms.Net.Configuration/SystemSettingConstVars.cs +++ b/CoreCms.Net.Configuration/SystemSettingConstVars.cs @@ -539,6 +539,61 @@ namespace CoreCms.Net.Configuration public const string SmsSignature = "smsSignature"; + /// + /// 账户注册-短信内容模板 + /// + public const string SmsTplForReg = "smsTplForReg"; + + /// + /// 账户登录-短信内容模板 + /// + public const string SmsTplForLogin = "smsTplForLogin"; + + /// + /// 验证验证码-短信内容模板 + /// + public const string SmsTplForVeri = "smsTplForVeri"; + + /// + /// 下单成功时-短信内容模板 + /// + public const string SmsTplForCreateOrder = "smsTplForCreateOrder"; + + /// + /// 订单支付成功时-短信内容模板 + /// + public const string SmsTplForOrderPayed = "smsTplForOrderPayed"; + + /// + /// 订单催付提醒-短信内容模板 + /// + public const string SmsTplForRemindOrderPay = "smsTplForRemindOrderPay"; + + /// + /// 订单发货通知-短信内容模板 + /// + public const string SmsTplForDeliveryNotice = "smsTplForDeliveryNotice"; + + /// + /// 售后确认通过-短信内容模板 + /// + public const string SmsTplForAfterSalesPass = "smsTplForAfterSalesPass"; + + /// + /// 用户退款成功通知-短信内容模板 + /// + public const string SmsTplForRefundSuccess = "smsTplForRefundSuccess"; + + /// + /// 订单付款成功平台通知-短信内容模板 + /// + public const string SmsTplForSellerOrderNotice = "smsTplForSellerOrderNotice"; + + /// + /// 通用类型-短信内容模板 + /// + public const string SmsTplForCommon = "smsTplForCommon"; + //网络打印机============================================================================ /// /// 是否开启 diff --git a/CoreCms.Net.Configuration/SystemSettingDictionary.cs b/CoreCms.Net.Configuration/SystemSettingDictionary.cs index 688738a..6491dc2 100644 --- a/CoreCms.Net.Configuration/SystemSettingDictionary.cs +++ b/CoreCms.Net.Configuration/SystemSettingDictionary.cs @@ -194,6 +194,19 @@ namespace CoreCms.Net.Configuration di.Add(SystemSettingConstVars.FilesStorageQiNiuBucketName, new DictionaryKeyValues() { sKey = "七牛云桶名称", sValue = "CoreShop" }); + //短信发送内容模板 + di.Add(SystemSettingConstVars.SmsTplForReg, new DictionaryKeyValues() { sKey = "账户注册", sValue = "您正在注册账号，验证码是{code}，请勿告诉他人。" }); + di.Add(SystemSettingConstVars.SmsTplForLogin, new DictionaryKeyValues() { sKey = "账户登录", sValue = "您正在登陆账号，验证码是{code}，请勿告诉他人。" }); + di.Add(SystemSettingConstVars.SmsTplForVeri, new DictionaryKeyValues() { sKey = "验证验证码", sValue = "您的验证码是{code}，请勿告诉他人。" }); + di.Add(SystemSettingConstVars.SmsTplForCreateOrder, new DictionaryKeyValues() { sKey = "下单成功时", sValue = "恭喜您，订单创建成功，祝您购物愉快。" }); + di.Add(SystemSettingConstVars.SmsTplForOrderPayed, new DictionaryKeyValues() { sKey = "订单支付成功时", sValue = "恭喜您，订单支付成功，祝您购物愉快。" }); + di.Add(SystemSettingConstVars.SmsTplForRemindOrderPay, new DictionaryKeyValues() { sKey = "订单催付提醒", sValue = "您的订单还有1个小时就要取消了，请及时进行支付。" }); + di.Add(SystemSettingConstVars.SmsTplForDeliveryNotice, new DictionaryKeyValues() { sKey = "订单发货通知", sValue = "您好，您的订单已经发货。" }); + di.Add(SystemSettingConstVars.SmsTplForAfterSalesPass, new DictionaryKeyValues() { sKey = "售后确认通过", sValue = "您好，您的售后已经通过。" }); + di.Add(SystemSettingConstVars.SmsTplForRefundSuccess, new DictionaryKeyValues() { sKey = "用户退款成功通知", sValue = "用户您好，您的退款已经处理，请确认。" }); + di.Add(SystemSettingConstVars.SmsTplForSellerOrderNotice, new DictionaryKeyValues() { sKey = "订单付款成功平台通知", sValue = "您有新的订单了，请及时处理。" }); + di.Add(SystemSettingConstVars.SmsTplForCommon, new DictionaryKeyValues() { sKey = "通用类型", sValue = "欢迎您访问我们的微信小程序，有问题请联系客服。" }); + return di; } diff --git a/CoreCms.Net.Services/Distribution/CoreCmsDistributionOrderServices.cs b/CoreCms.Net.Services/Distribution/CoreCmsDistributionOrderServices.cs index 1403ca6..55a2068 100644 --- a/CoreCms.Net.Services/Distribution/CoreCmsDistributionOrderServices.cs +++ b/CoreCms.Net.Services/Distribution/CoreCmsDistributionOrderServices.cs @@ -144,7 +144,7 @@ namespace CoreCms.Net.Services //查询获取几级返利 var user = await _userServices.QueryByClauseAsync(p => p.id == order.userId); - if (user != null && user.parentId > 0) + if (user is { parentId: > 0 }) { //获取购物明细 var orderItems = await _orderItemServices.QueryListByClauseAsync(p => p.orderId == order.orderId); diff --git a/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs b/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs index 117dc41..13fe02e 100644 --- a/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs +++ b/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs @@ -234,10 +234,18 @@ namespace CoreCms.Net.Services iData.gradeId = disGradeModel.id; } } - if (iData.verifyStatus == 0) + + var allConfigs = await _settingServices.GetConfigDictionaries(); + var distributionType = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionType).ObjectToInt(0); + if (distributionType == (int)GlobalEnumVars.DistributionConditionType.NoReview) + { + iData.verifyStatus = (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes; + } + else { iData.verifyStatus = (int)GlobalEnumVars.DistributionVerifyStatus.VerifyWait; } + iData.isDelete = false; iData.createTime = DateTime.Now; diff --git a/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs b/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs index eed719b..31f0e4e 100644 --- a/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs +++ b/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs @@ -24,6 +24,7 @@ using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; using CoreCms.Net.Model.ViewModels.Basics; using CoreCms.Net.Model.ViewModels.UI; +using CoreCms.Net.Utility.Extensions; using CoreCms.Net.Utility.Helper; using Newtonsoft.Json; using SqlSugar; @@ -454,7 +455,7 @@ namespace CoreCms.Net.Services goodId = "", num = 0, }); - if (obj.goodId == goodId.ToString()) return false; + if (obj.goodId.ObjectToInt(0) != goodId) return false; promotionsModel = promotions; return true; } diff --git a/CoreCms.Net.Services/Message/CoreCmsSmsServices.cs b/CoreCms.Net.Services/Message/CoreCmsSmsServices.cs index f24fa93..8a91ce3 100644 --- a/CoreCms.Net.Services/Message/CoreCmsSmsServices.cs +++ b/CoreCms.Net.Services/Message/CoreCmsSmsServices.cs @@ -225,7 +225,111 @@ namespace CoreCms.Net.Services { isUsed = true; } - var str = SmsHelper.GetTemp(code, parameters); + + + var str = string.Empty; + var allConfigs = await _settingServices.GetConfigDictionaries(); + + if (code == GlobalEnumVars.SmsMessageTypes.Reg.ToString()) + { + // 账户注册 + var msg = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.SmsTplForReg); + if (!string.IsNullOrEmpty(msg)) + { + var sendCode = string.Empty; + if (parameters.ContainsKey("code")) + { + sendCode = parameters["code"]?.ToString(); + } + str = msg.Replace("{code}", sendCode); + } + } + else if (code == GlobalEnumVars.SmsMessageTypes.Login.ToString()) + { + // 账户登录 + var msg = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.SmsTplForLogin); + if (!string.IsNullOrEmpty(msg)) + { + var sendCode = string.Empty; + if (parameters.ContainsKey("code")) + { + sendCode = parameters["code"]?.ToString(); + } + str = msg.Replace("{code}", sendCode); + } + } + else if (code == GlobalEnumVars.SmsMessageTypes.Veri.ToString()) + { + // 验证验证码 + var msg = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.SmsTplForVeri); + if (!string.IsNullOrEmpty(msg)) + { + var sendCode = string.Empty; + if (parameters.ContainsKey("code")) + { + sendCode = parameters["code"]?.ToString(); + } + str = msg.Replace("{code}", sendCode); + } + } + else if (code == GlobalEnumVars.PlatformMessageTypes.CreateOrder.ToString()) + { + // 订单创建 + var msg = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.SmsTplForCreateOrder); + str = !string.IsNullOrEmpty(msg) ? msg : string.Empty; + } + else if (code == GlobalEnumVars.PlatformMessageTypes.OrderPayed.ToString()) + { + // 订单支付通知买家 + var msg = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.SmsTplForOrderPayed); + str = !string.IsNullOrEmpty(msg) ? msg : string.Empty; + } + else if (code == GlobalEnumVars.PlatformMessageTypes.RemindOrderPay.ToString()) + { + // 未支付催单 + var msg = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.SmsTplForRemindOrderPay); + str = !string.IsNullOrEmpty(msg) ? msg : string.Empty; + } + else if (code == GlobalEnumVars.PlatformMessageTypes.DeliveryNotice.ToString()) + { + // 订单发货 + var msg = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.SmsTplForDeliveryNotice); + str = !string.IsNullOrEmpty(msg) ? msg : string.Empty; + } + else if (code == GlobalEnumVars.PlatformMessageTypes.AfterSalesPass.ToString()) + { + // 售后审核通过 + var msg = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.SmsTplForAfterSalesPass); + str = !string.IsNullOrEmpty(msg) ? msg : string.Empty; + } + else if (code == GlobalEnumVars.PlatformMessageTypes.RefundSuccess.ToString()) + { + // 退款已处理 + var msg = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.SmsTplForRefundSuccess); + str = !string.IsNullOrEmpty(msg) ? msg : string.Empty; + } + else if (code == GlobalEnumVars.PlatformMessageTypes.SellerOrderNotice.ToString()) + { + // 订单支付通知卖家 + var msg = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.SmsTplForSellerOrderNotice); + str = !string.IsNullOrEmpty(msg) ? msg : string.Empty; + } + else if (code == GlobalEnumVars.PlatformMessageTypes.Common.ToString()) + { + //通用类型 + var tpl = string.Empty; + if (parameters.ContainsKey("tpl")) + { + tpl = parameters["tpl"]?.ToString(); + } + str = tpl; + if (!string.IsNullOrEmpty(str)) + { + var msg = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.SmsTplForCommon); + str = !string.IsNullOrEmpty(msg) ? msg : string.Empty; + } + } + if (string.IsNullOrEmpty(str)) { jm.msg = GlobalErrorCodeVars.Code10009; diff --git a/CoreCms.Net.Services/Promotion/CoreCmsPromotionResultServices.cs b/CoreCms.Net.Services/Promotion/CoreCmsPromotionResultServices.cs index 56df364..384accf 100644 --- a/CoreCms.Net.Services/Promotion/CoreCmsPromotionResultServices.cs +++ b/CoreCms.Net.Services/Promotion/CoreCmsPromotionResultServices.cs @@ -31,7 +31,7 @@ namespace CoreCms.Net.Services { private readonly ICoreCmsPromotionResultRepository _dal; - private ICoreCmsPromotionConditionServices _promotionConditionServices; + private readonly ICoreCmsPromotionConditionServices _promotionConditionServices; private readonly IUnitOfWork _unitOfWork; @@ -156,7 +156,7 @@ namespace CoreCms.Net.Services { case (int)GlobalEnumVars.PromotionType.Promotion: //总促销修改 - cart.orderPromotionMoney = cart.orderPromotionMoney + (decimal)parameters["money"]; + cart.orderPromotionMoney += (decimal)parameters["money"]; //设置促销列表 if (cart.promotionList.ContainsKey(promotionInfo.id)) { @@ -171,7 +171,7 @@ namespace CoreCms.Net.Services case (int)GlobalEnumVars.PromotionType.Coupon: //优惠券促销金额 - cart.couponPromotionMoney = cart.couponPromotionMoney + (decimal)parameters["money"]; + cart.couponPromotionMoney += (decimal)parameters["money"]; break; } return true; @@ -190,7 +190,7 @@ namespace CoreCms.Net.Services //var objDiscount = Convert.ToInt32(parameters["discount"]); if (!parameters.ContainsKey("discount")) return true; - var objDiscount = parameters["discount"].ObjectToInt(0); + var objDiscount = parameters["discount"].ObjectToDecimal(0); //判断参数是否设置的正确 if (objDiscount >= 10 || objDiscount <= 0) @@ -264,7 +264,7 @@ namespace CoreCms.Net.Services public decimal result_GOODS_DISCOUNT(JObject parameters, CartProducts cartProducts, CoreCmsPromotion promotionInfo) { if (!parameters.ContainsKey("discount")) return 0; - var objDiscount = parameters["discount"].ObjectToInt(0); + var objDiscount = parameters["discount"].ObjectToDecimal(0); decimal promotionMoney = 0; decimal goodsPrice = cartProducts.products.price; diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop.vue index 3cc78d7..a396316 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop.vue @@ -1,47 +1,47 @@