diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/Controllers/Controller.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/Controllers/Controller.tpl index cac57272bcdfc4d1814e6599caaa8982ee822adf..668936d83098f078bc4c2116716c34363b55543f 100644 --- a/CoreCms.Net.CodeGenerator/CrudTemplete/Controllers/Controller.tpl +++ b/CoreCms.Net.CodeGenerator/CrudTemplete/Controllers/Controller.tpl @@ -19,7 +19,7 @@ using CoreCms.Net.Configuration; using CoreCms.Net.Model.Entities; using CoreCms.Net.Model.Entities.Expression; using CoreCms.Net.Model.FromBody; -using CoreCms.Net.Model.ViewModels.UI; +using CoreCms.Net.Model.ViewModel.UI; using CoreCms.Net.Filter; using CoreCms.Net.Loging; using CoreCms.Net.IServices; @@ -95,7 +95,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (!string.IsNullOrEmpty({{field.DbColumnName}})) { where = where.And(p => p.{{field.DbColumnName}}.Contains({{field.DbColumnName}})); - }{% elsif field.DataType == 'int' %} + }{% elsif field.DataType == 'int' or field.DataType == 'bigint' %} //{{field.ColumnDescription}} {{field.DataType}} var {{field.DbColumnName}} = Request.Form["{{field.DbColumnName}}"].FirstOrDefault().ObjectToInt(0); if ({{field.DbColumnName}} > 0) @@ -388,7 +388,7 @@ namespace CoreCms.Net.Web.Admin.Controllers if (!string.IsNullOrEmpty({{field.DbColumnName}})) { where = where.And(p => p.{{field.DbColumnName}}.Contains({{field.DbColumnName}})); - }{% elsif field.DataType == 'int' %} + }{% elsif field.DataType == 'int' or field.DataType == 'bigint' %} //{{field.ColumnDescription}} {{field.DataType}} var {{field.DbColumnName}} = Request.Form["{{field.DbColumnName}}"].FirstOrDefault().ObjectToInt(0); if ({{field.DbColumnName}} > 0) diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/DbModel/Model.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/DbModel/Model.tpl index 7af6a591c748fece03500e308322d7be5e7c62e5..cb4e6e9c2e93c10846e236318f651723cecfef01 100644 --- a/CoreCms.Net.CodeGenerator/CrudTemplete/DbModel/Model.tpl +++ b/CoreCms.Net.CodeGenerator/CrudTemplete/DbModel/Model.tpl @@ -46,6 +46,10 @@ namespace CoreCms.Net.Model.Entities public System.Int32 {{field.DbColumnName}} { get; set; } {% elsif field.DataType == 'int' and field.IsNullable == true %} public System.Int32? {{field.DbColumnName}} { get; set; } + {% elsif field.DataType == 'bigint' and field.IsNullable == false %} + public System.Int64 {{field.DbColumnName}} { get; set; } + {% elsif field.DataType == 'bigint' and field.IsNullable == true %} + public System.Int64? {{field.DbColumnName}} { get; set; } {% elsif field.DataType == 'float' and field.IsNullable == false %} public float {{field.DbColumnName}} { get; set; } {% elsif field.DataType == 'float' and field.IsNullable == true %} diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/IRepository.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/IRepository.tpl index 0c9674379c59967a978313227f25804009eb5a72..ee11b5dbceec7094496db142b5a36cde806df789 100644 --- a/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/IRepository.tpl +++ b/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/IRepository.tpl @@ -13,8 +13,8 @@ using System.Collections.Generic; using System.Linq.Expressions; using System.Threading.Tasks; using CoreCms.Net.Model.Entities; -using CoreCms.Net.Model.ViewModels.Basics; -using CoreCms.Net.Model.ViewModels.UI; +using CoreCms.Net.Model.ViewModel.Basics; +using CoreCms.Net.Model.ViewModel.UI; using SqlSugar; diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/Repository.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/Repository.tpl index f9bc77b548a4432e298471b855a9ccd0e1aac1cd..66dd7d2ee24cf96a3836e145cb3dca401127c96c 100644 --- a/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/Repository.tpl +++ b/CoreCms.Net.CodeGenerator/CrudTemplete/Repositories/Repository.tpl @@ -15,10 +15,10 @@ using System.Threading.Tasks; using CoreCms.Net.Caching.Manual; using CoreCms.Net.Configuration; using CoreCms.Net.Model.Entities; -using CoreCms.Net.Model.ViewModels.Basics; +using CoreCms.Net.Model.ViewModel.Basics; using CoreCms.Net.IRepository; using CoreCms.Net.IRepository.UnitOfWork; -using CoreCms.Net.Model.ViewModels.UI; +using CoreCms.Net.Model.ViewModel.UI; using SqlSugar; namespace CoreCms.Net.Repository diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/Services/IServices.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/Services/IServices.tpl index a1a84515a5a2460a4adb340325305df9cae1a386..e986f2e109b63cd00482e3ac64be27e1a1f8f60d 100644 --- a/CoreCms.Net.CodeGenerator/CrudTemplete/Services/IServices.tpl +++ b/CoreCms.Net.CodeGenerator/CrudTemplete/Services/IServices.tpl @@ -13,8 +13,8 @@ using System.Collections.Generic; using System.Linq.Expressions; using System.Threading.Tasks; using CoreCms.Net.Model.Entities; -using CoreCms.Net.Model.ViewModels.Basics; -using CoreCms.Net.Model.ViewModels.UI; +using CoreCms.Net.Model.ViewModel.Basics; +using CoreCms.Net.Model.ViewModel.UI; using SqlSugar; namespace CoreCms.Net.IServices diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/Services/Services.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/Services/Services.tpl index 6ad24cc11abcbd1cd897dcddd568e7313ded409e..4d962da877396e3404482e1823eec59f15bbaf5c 100644 --- a/CoreCms.Net.CodeGenerator/CrudTemplete/Services/Services.tpl +++ b/CoreCms.Net.CodeGenerator/CrudTemplete/Services/Services.tpl @@ -17,8 +17,8 @@ using CoreCms.Net.IRepository; using CoreCms.Net.IRepository.UnitOfWork; using CoreCms.Net.IServices; using CoreCms.Net.Model.Entities; -using CoreCms.Net.Model.ViewModels.Basics; -using CoreCms.Net.Model.ViewModels.UI; +using CoreCms.Net.Model.ViewModel.Basics; +using CoreCms.Net.Model.ViewModel.UI; using SqlSugar; diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/View/Create.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/View/Create.tpl index f5fd14631743f0c6b1f700a5ad7c654e2136aa31..f4d2b1558b4810f4d0879e5d481417e2668cae3b 100644 --- a/CoreCms.Net.CodeGenerator/CrudTemplete/View/Create.tpl +++ b/CoreCms.Net.CodeGenerator/CrudTemplete/View/Create.tpl @@ -21,7 +21,7 @@
{% if field.Length >0 %}{% else %}{% endif %}
- {% elsif field.DataType == 'int' %} + {% elsif field.DataType == 'int' or field.DataType == 'bigint' %}
diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/View/Edit.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/View/Edit.tpl index 71f16694ea7578ee7248a8b90f51634286ae6721..f4ff65dfeda7d2e38e2a9b1f25e4e6a645e797bf 100644 --- a/CoreCms.Net.CodeGenerator/CrudTemplete/View/Edit.tpl +++ b/CoreCms.Net.CodeGenerator/CrudTemplete/View/Edit.tpl @@ -22,7 +22,7 @@ {% if field.Length >0 %}{% else %} {% endif %}
-
{% elsif field.DataType == 'int' %} + {% elsif field.DataType == 'int' or field.DataType == 'bigint' %}
diff --git a/CoreCms.Net.Services/Cart/CoreCmsCartServices.cs b/CoreCms.Net.Services/Cart/CoreCmsCartServices.cs index 749979bc349de2edaff25f66028f3d9d105ea4a4..4ede8aef8fed7ab060925aea1643f5bd21a43c42 100644 --- a/CoreCms.Net.Services/Cart/CoreCmsCartServices.cs +++ b/CoreCms.Net.Services/Cart/CoreCmsCartServices.cs @@ -559,7 +559,7 @@ namespace CoreCms.Net.Services //算订单总价格 cartDto.amount = Math.Round(cartDto.amount + item.products.amount, 2); //计算总重量 - cartDto.weight = Math.Round(cartDto.weight + Math.Round(item.weight + item.nums, 2), 2); + cartDto.weight = Math.Round(cartDto.weight + Math.Round(item.weight * item.nums, 2), 2); } } diff --git a/CoreCms.Net.Services/Mediator/EventHandler/SendWxMessageEventHandler.cs b/CoreCms.Net.Services/Mediator/EventHandler/SendWxMessageEventHandler.cs index 0dcf71eefbd1f7f02f0cdc3a1fd4237f789d4edf..e1887727035d9f62acb5dead16b3d5a9720860c1 100644 --- a/CoreCms.Net.Services/Mediator/EventHandler/SendWxMessageEventHandler.cs +++ b/CoreCms.Net.Services/Mediator/EventHandler/SendWxMessageEventHandler.cs @@ -212,7 +212,8 @@ namespace CoreCms.Net.Services.Mediator { return await _userWeChatMsgTemplateServices.QueryByClauseAsync(p => p.templateId == info.templateId); } - return null; + return await _userWeChatMsgTemplateServices.QueryByClauseAsync(p => p.templateTitle == info.templateId); + //return null; } #endregion diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue index 3500706bdfb0ed807d3935c6655a03595bf1adcb..f42819fedd6c60b28afcd7126946fa11bb74cf13 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/placeOrder/index/index.vue @@ -98,7 +98,7 @@ {{ item.products.name || ''}} - {{ item.products.spes_desc || ''}} + {{ item.products.spesDesc || ''}} {{ v.name || ''}} @@ -338,6 +338,9 @@ this.getUserCounpons() //获取默认门店信息 this.getDefaultStore(); + + console.log("当前scene值:" + this.$store.state.scene); + }, onShow() { // #ifdef MP-ALIPAY || MP-TOUTIAO @@ -599,7 +602,8 @@ receiptType: this.receiptType, teamId: this.teamId, groupId: this.groupId, - orderType: this.params.orderType //订单类型 + orderType: this.params.orderType, //订单类型 + scene: this.$store.state.scene //场景值（用于确定小程序是否来源直播和视频号） } let delivery = {} @@ -640,8 +644,6 @@ } } - - // 发票信息 data['taxType'] = this.invoice.type data['taxName'] = this.invoice.name diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/placeOrder.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/placeOrder.scss index 02010ef56158349f8a22083eec4ace5c6d659e4b..6a9df527f1056a3358a96afebfe26c1ae956ffc8 100644 --- a/CoreCms.Net.Uni-App/CoreShop/static/style/placeOrder.scss +++ b/CoreCms.Net.Uni-App/CoreShop/static/style/placeOrder.scss @@ -19,7 +19,7 @@ } .goods-info-view-box { position: relative; padding: 27.27rpx 18.18rpx; .cu-avatar { position: absolute; height: 163.63rpx; width: 163.63rpx; left: 18.18rpx; } - .goods-info-view { position: relative; padding-left: 181.81rpx; height: 163.63rpx; line-height: 1.4; + .goods-info-view { position: relative; padding-left: 181.81rpx; min-height: 163.63rpx; line-height: 1.4; .coreshop-tag-view { position: relative; } .goods-price-view { position: relative; line-height: 1.7; top: 9.09rpx; .goods-num { width: 50rpx; position: absolute; right: 5rpx; top: 5rpx; } diff --git a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs index fa6b7a0aa6fee765eea5c44f5a72bc7e3535b6c3..b9f6727ecfccc2ee06c4d9eab4b07323b80b4c43 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs @@ -295,6 +295,14 @@ namespace CoreCms.Net.Web.Admin.Controllers { var jm = new AdminUiCallBack(); + if (entity.trueName.Length > 4) + { + jm.msg = "用户真实姓名不能大于4个字符。"; + return Json(jm); + } + + + var userModel = await _sysUserServices.QueryByIdAsync(_user.ID); if (!string.IsNullOrEmpty(entity.nickName)) userModel.nickName = entity.nickName; @@ -1250,7 +1258,7 @@ namespace CoreCms.Net.Web.Admin.Controllers /// /// [HttpPost] - public JsonResult GetArea() + public async Task GetArea() { var jm = new WebApiCallBack(); @@ -1260,7 +1268,7 @@ namespace CoreCms.Net.Web.Admin.Controllers var ids = new List(); if (!string.IsNullOrEmpty(idsStr)) ids = JsonConvert.DeserializeObject>(idsStr); - var areaTrees = _areaServices.GetTreeArea(ids, nodeId, ischecked); + var areaTrees =await _areaServices.GetTreeArea(ids, nodeId, ischecked); jm.status = true; jm.data = areaTrees; diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj index 893d0ccc1ccd8bb03d8df75a673e90729fc734d9..3bd7cb620b8cb09fae97a673c16fb63f9390a228 100644 --- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj +++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj @@ -93,10 +93,6 @@ - - true - PreserveNewest - true PreserveNewest diff --git a/CoreCms.Net.Web.Admin/wwwroot/favicon.ico b/CoreCms.Net.Web.Admin/wwwroot/favicon.ico deleted file mode 100644 index c8981233832729d7d5ab17530404078e79726153..0000000000000000000000000000000000000000 Binary files a/CoreCms.Net.Web.Admin/wwwroot/favicon.ico and /dev/null differ diff --git a/CoreCms.Net.Web.Admin/wwwroot/index.html b/CoreCms.Net.Web.Admin/wwwroot/index.html index b7c97f6b42231656574e017ca22cdcf6988fb766..8366362c8a84b275bd98e9ea561827705e22ada7 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/index.html @@ -8,7 +8,7 @@ - + diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/style/login.css b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/style/login.css index c54b3df8f144eb78cc4f00eaf7e3d833ed9efd7b..3ecc7f16cdd717a4f6341c3b002cdff82f10d328 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/style/login.css +++ b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/style/login.css @@ -1010,9 +1010,6 @@ form > .row > .col-sm-12.mb-2 > .form-group { position: relative } div#agreement > h3, div#privacy > h3 { font-size: 20px } div#agreement > p, div#privacy > p { font-size: 14px } a.social-login-link { cursor: pointer } -.fa-baidu { overflow: hidden; position: relative; height: 32px; width: 32px; margin-top: 9px } -.fa-baidu-del { background: url(/static/images/common/baidu.png) no-repeat; height: 100%; width: 100%; display: inline-block; filter: drop-shadow(32px 0 #009688); position: relative; left: -32px } -.fa-baidu:hover > .fa-baidu-del { background: url(/static/images/common/baidu.png) no-repeat; height: 100%; width: 100%; display: inline-block; opacity: .8; filter: alpha(opacity=80); color: #fff; position: relative; left: -32px } .layui-form-checked[lay-skin=primary] i { border-color: #009688 !important; background-color: #009688; color: #fff; } diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/style/overWrite.css b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/style/overWrite.css index 46c1eb5711d9bc6d2dad95f7c353554ef7b48489..f841a0b9bb6c90c6ec77d5330bf9622a86a46183 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/style/overWrite.css +++ b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/style/overWrite.css @@ -995,6 +995,9 @@ xm-select .xm-body .xm-option.hide-icon.selected { margin-top: -24px; } /*自定义全局包围*/ +.coreshop-admin .layui-logo { + padding: 0px; +} .coreshop-admin .layui-logo span { font-size: 21px; font-weight: 550; diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/style/overWrite.less b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/style/overWrite.less index 2ade17ac26209baefb0ba3585de6ea617b1f58e0..297e0fe496027e041078631986d81fbe90dac58c 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/style/overWrite.less +++ b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/style/overWrite.less @@ -311,7 +311,7 @@ xm-select .xm-label .xm-label-block, xm-select .xm-body .xm-option.hide-icon.sel } /*自定义全局包围*/ .coreshop-admin { - .layui-logo { + .layui-logo { padding: 0px; span { font-size: 21px; font-weight: 550; letter-spacing: 5px; } } } diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/style/overWrite.min.css b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/style/overWrite.min.css index ebc951a597f5e47ca7646c96be937a3bda5e2c87..cd16578bf36d8b8d5efbd16eda60a1ae9c21da34 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/style/overWrite.min.css +++ b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/style/overWrite.min.css @@ -1 +1 @@ -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:13px;}.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;}.warning-msg{font-size:12px;}.warning-msg-content{background-color:#ffc;border:1px solid #ff3;padding:10px;margin-bottom:15px;color:#666;}.warning-msg-content i{display:inline-block;font-size:16px;margin-right:5px;color:#f00;}.warning-msg-content p{display:inline-block;}.warning-msg-content a{color:#20a53a;}.warning-msg-content a:hover{color:#23527c;}.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:13px;}.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;}.coreshop-search-form,.coreshop-toolbar-search-form{border:1px solid #e6e6e6;padding:10px;margin:10px 10px 0 10px;}.coreshop-search-form .layui-input,.coreshop-toolbar-search-form .layui-input,.coreshop-search-form .layui-select,.coreshop-toolbar-search-form .layui-select,.coreshop-search-form .layui-textarea,.coreshop-toolbar-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-search-form .layui-form-label,.coreshop-toolbar-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-search-form .layui-input-block,.coreshop-toolbar-search-form .layui-input-block{margin-left:74px;min-height:26px;}.coreshop-search-form .layui-form-select dl,.coreshop-toolbar-search-form .layui-form-select dl{top:29px;}.coreshop-search-form .layui-form-end-item,.coreshop-toolbar-search-form .layui-form-end-item{margin-bottom:0;}.coreshop-search-form .layui-form-item,.coreshop-toolbar-search-form .layui-form-item{margin-bottom:0;}.coreshop-search-form .layui-form-item .layui-inline,.coreshop-toolbar-search-form .layui-form-item .layui-inline{margin-bottom:0;margin-right:0;}.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline,.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline{margin-right:5px;width:150px;font-size:12px;}.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input::-webkit-input-placeholder,.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input::-webkit-input-placeholder{font-size:12px;}.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input::-moz-placeholder,.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input::-moz-placeholder{font-size:12px;}.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input:-ms-input-placeholder,.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input:-ms-input-placeholder{font-size:12px;}.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input:-moz-placeholder,.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input:-moz-placeholder{font-size:12px;}.coreshop-search-form xm-select,.coreshop-toolbar-search-form xm-select{min-height:28px;line-height:28px;}.coreshop-search-form xm-select *,.coreshop-toolbar-search-form xm-select *{font-size:12px;}.coreshop-search-form .xm-body .xm-tree .xm-option-content,.coreshop-toolbar-search-form .xm-body .xm-tree .xm-option-content{padding-left:6px;font-size:12px;}.coreshop-search-form xm-select .xm-label .scroll .label-content,.coreshop-toolbar-search-form xm-select .xm-label .scroll .label-content{line-height:28px;}.coreshop-search-form xm-select>.xm-label .scroll .label-content,.coreshop-toolbar-search-form xm-select>.xm-label .scroll .label-content{display:flex;padding:0 20px 0 10px;font-size:12px;}.coreshop-search-form .layui-form-mid,.coreshop-toolbar-search-form .layui-form-mid{padding:4px 0 !important;}.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 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-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-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 .imgdiv,.editGoodsTypes .imgdiv,.editGoodsParameters .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{margin:0;}.addGoods .layui-upload-list,.editGoodsTypes .layui-upload-list,.editGoodsParameters .layui-upload-list{margin:10px 0;overflow:hidden;}.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 .new-spec,.editGoodsTypes .new-spec,.editGoodsParameters .new-spec{display:inline-block;width:100px;}.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 .spec_image,.editGoodsTypes .spec_image,.editGoodsParameters .spec_image{display:inline-block;}.addGoods .spec_image_item,.editGoodsTypes .spec_image_item,.editGoodsParameters .spec_image_item{position:relative;display:inline-block;}.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-label,.editGoodsTypes .layui-form-label,.editGoodsParameters .layui-form-label{padding:8px 3px;width:90px;}.addGoods .layui-form-pane .layui-input-block,.editGoodsTypes .layui-form-pane .layui-input-block,.editGoodsParameters .layui-form-pane .layui-input-block{margin-left:90px;left:-1px;}.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;}.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 span{font-size:21px;font-weight:550;letter-spacing:5px;}.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;} \ No newline at end of file +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:13px;}.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;}.warning-msg{font-size:12px;}.warning-msg-content{background-color:#ffc;border:1px solid #ff3;padding:10px;margin-bottom:15px;color:#666;}.warning-msg-content i{display:inline-block;font-size:16px;margin-right:5px;color:#f00;}.warning-msg-content p{display:inline-block;}.warning-msg-content a{color:#20a53a;}.warning-msg-content a:hover{color:#23527c;}.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:13px;}.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;}.coreshop-search-form,.coreshop-toolbar-search-form{border:1px solid #e6e6e6;padding:10px;margin:10px 10px 0 10px;}.coreshop-search-form .layui-input,.coreshop-toolbar-search-form .layui-input,.coreshop-search-form .layui-select,.coreshop-toolbar-search-form .layui-select,.coreshop-search-form .layui-textarea,.coreshop-toolbar-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-search-form .layui-form-label,.coreshop-toolbar-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-search-form .layui-input-block,.coreshop-toolbar-search-form .layui-input-block{margin-left:74px;min-height:26px;}.coreshop-search-form .layui-form-select dl,.coreshop-toolbar-search-form .layui-form-select dl{top:29px;}.coreshop-search-form .layui-form-end-item,.coreshop-toolbar-search-form .layui-form-end-item{margin-bottom:0;}.coreshop-search-form .layui-form-item,.coreshop-toolbar-search-form .layui-form-item{margin-bottom:0;}.coreshop-search-form .layui-form-item .layui-inline,.coreshop-toolbar-search-form .layui-form-item .layui-inline{margin-bottom:0;margin-right:0;}.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline,.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline{margin-right:5px;width:150px;font-size:12px;}.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input::-webkit-input-placeholder,.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input::-webkit-input-placeholder{font-size:12px;}.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input::-moz-placeholder,.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input::-moz-placeholder{font-size:12px;}.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input:-ms-input-placeholder,.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input:-ms-input-placeholder{font-size:12px;}.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input:-moz-placeholder,.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input:-moz-placeholder{font-size:12px;}.coreshop-search-form xm-select,.coreshop-toolbar-search-form xm-select{min-height:28px;line-height:28px;}.coreshop-search-form xm-select *,.coreshop-toolbar-search-form xm-select *{font-size:12px;}.coreshop-search-form .xm-body .xm-tree .xm-option-content,.coreshop-toolbar-search-form .xm-body .xm-tree .xm-option-content{padding-left:6px;font-size:12px;}.coreshop-search-form xm-select .xm-label .scroll .label-content,.coreshop-toolbar-search-form xm-select .xm-label .scroll .label-content{line-height:28px;}.coreshop-search-form xm-select>.xm-label .scroll .label-content,.coreshop-toolbar-search-form xm-select>.xm-label .scroll .label-content{display:flex;padding:0 20px 0 10px;font-size:12px;}.coreshop-search-form .layui-form-mid,.coreshop-toolbar-search-form .layui-form-mid{padding:4px 0 !important;}.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 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-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-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 .imgdiv,.editGoodsTypes .imgdiv,.editGoodsParameters .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{margin:0;}.addGoods .layui-upload-list,.editGoodsTypes .layui-upload-list,.editGoodsParameters .layui-upload-list{margin:10px 0;overflow:hidden;}.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 .new-spec,.editGoodsTypes .new-spec,.editGoodsParameters .new-spec{display:inline-block;width:100px;}.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 .spec_image,.editGoodsTypes .spec_image,.editGoodsParameters .spec_image{display:inline-block;}.addGoods .spec_image_item,.editGoodsTypes .spec_image_item,.editGoodsParameters .spec_image_item{position:relative;display:inline-block;}.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-label,.editGoodsTypes .layui-form-label,.editGoodsParameters .layui-form-label{padding:8px 3px;width:90px;}.addGoods .layui-form-pane .layui-input-block,.editGoodsTypes .layui-form-pane .layui-input-block,.editGoodsParameters .layui-form-pane .layui-input-block{margin-left:90px;left:-1px;}.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;}.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;}.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;} \ No newline at end of file diff --git a/CoreCms.Net.Web.Admin/wwwroot/static/images/common/baidu.png b/CoreCms.Net.Web.Admin/wwwroot/static/images/common/baidu.png deleted file mode 100644 index 0c272b3293dbedd4b95c81543331220733800b18..0000000000000000000000000000000000000000 Binary files a/CoreCms.Net.Web.Admin/wwwroot/static/images/common/baidu.png and /dev/null differ diff --git a/CoreCms.Net.Web.Admin/wwwroot/static/images/common/coreshop.png b/CoreCms.Net.Web.Admin/wwwroot/static/images/common/coreshop.png new file mode 100644 index 0000000000000000000000000000000000000000..0b85ec9cc64d39e7638fa24a28041404caff8b74 Binary files /dev/null and b/CoreCms.Net.Web.Admin/wwwroot/static/images/common/coreshop.png differ diff --git a/CoreCms.Net.Web.Admin/wwwroot/static/images/common/coreshop.psd b/CoreCms.Net.Web.Admin/wwwroot/static/images/common/coreshop.psd new file mode 100644 index 0000000000000000000000000000000000000000..b68307ed0faf975d31c204ad369d9e6b82c2d72d Binary files /dev/null and b/CoreCms.Net.Web.Admin/wwwroot/static/images/common/coreshop.psd differ diff --git a/CoreCms.Net.Web.Admin/wwwroot/static/images/common/favicon.ico b/CoreCms.Net.Web.Admin/wwwroot/static/images/common/favicon.ico index 316865ff7b4aa836564b1b929f6c3857845300cd..c8981233832729d7d5ab17530404078e79726153 100644 Binary files a/CoreCms.Net.Web.Admin/wwwroot/static/images/common/favicon.ico and b/CoreCms.Net.Web.Admin/wwwroot/static/images/common/favicon.ico differ diff --git a/CoreCms.Net.Web.Admin/wwwroot/static/images/common/favicon.png b/CoreCms.Net.Web.Admin/wwwroot/static/images/common/favicon.png deleted file mode 100644 index 316865ff7b4aa836564b1b929f6c3857845300cd..0000000000000000000000000000000000000000 Binary files a/CoreCms.Net.Web.Admin/wwwroot/static/images/common/favicon.png and /dev/null differ diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html index 8c9d2477941a8ce852173b2b47dd6af542785337..1cc76a95aa70b444ad4e2eebb2283d23afbeed20 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html @@ -31,10 +31,10 @@
-
+
-
+
@@ -470,7 +470,6 @@ form.on('submit(LAY-app-CoreCmsGoods-batchModifyPrice-submit)', function (data) { var field = data.field; //获取提交的字段 - field.ids = e.data.entity.id; if (debug) { console.log(field); } //开启调试返回数据 //return false; //提交 Ajax 成功后，关闭当前弹层并重载表格 @@ -507,7 +506,7 @@ form.on('submit(LAY-app-CoreCmsGoods-batchModifyStock-submit)', function (data) { var field = data.field; //获取提交的字段 - field.ids = e.data.entity.id; + field.ids = field.ids.split(','); if (debug) { console.log(field); } //开启调试返回数据 //return false; //提交 Ajax 成功后，关闭当前弹层并重载表格 diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/layout.html b/CoreCms.Net.Web.Admin/wwwroot/views/layout.html index 01ad052e52e6bf5214b939fc5afaf4ae429cc770..ae78296a62c2e3469a68ac7d0d4d1c491bd310e7 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/layout.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/layout.html @@ -55,10 +55,11 @@