From c3dd1b7c30c4db09ff47ac6c2adf1239e77741a7 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Wed, 24 Nov 2021 12:10:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8E=E7=AB=AF=E7=99=BB=E5=BD=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Com/ToolsController.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs index 0bcfa28..732c11d 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Com/ToolsController.cs @@ -261,21 +261,29 @@ namespace CoreCms.Net.Web.Admin.Controllers return jm; } - if (CommonHelper.Md5For32(entity.oldPassword) == CommonHelper.Md5For32(entity.password)) + if (entity.password == entity.oldPassword) { - jm.msg = "新密码与旧密码相同,无需修改"; + jm.msg = "请设置与旧密码不同的新密码"; return jm; } + var oldPassWord = CommonHelper.Md5For32(entity.oldPassword); + var newPassWord = CommonHelper.Md5For32(entity.password); + var userModel = await _sysUserServices.QueryByIdAsync(_user.ID); - var newPassWord = CommonHelper.Md5For32(entity.oldPassword).ToLowerInvariant(); - if (userModel.passWord.ToLowerInvariant() != newPassWord) + if (userModel.passWord != oldPassWord) { jm.msg = "旧密码输入错误"; return jm; } + else if (userModel.passWord == newPassWord) + { + jm.msg = "新旧密码一致，无需修改，请设置与旧密码不同的新密码"; + return jm; + } userModel.passWord = newPassWord; + var bl = await _sysUserServices.UpdateAsync(userModel); jm.code = bl ? 0 : 1; -- Gitee From 2fce29173bc434dc718bb7d779377922566063c6 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Fri, 26 Nov 2021 00:01:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=A6=96=E9=A1=B5=E5=8F=AF=E8=A7=86?= =?UTF-8?q?=E5=8C=96=E3=80=90=E9=A1=B5=E9=9D=A2=E8=AE=BE=E8=AE=A1=E3=80=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E3=80=90=E5=95=86=E5=93=81Tab=E5=8D=A1?= =?UTF-8?q?=E3=80=91=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=94=AF=E6=8C=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A4=9A=E4=B8=AAtab=EF=BC=8C=E6=AF=8F=E4=B8=AAtab?= =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E6=8D=86=E7=BB=91=E5=95=86=E5=93=81=E3=80=82?= =?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?=E8=80=81=E5=95=86=E5=93=81=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BA=A7?= =?UTF-8?q?=E5=88=86=E9=94=80=E9=87=91=E9=A2=9D=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E3=80=81=E4=BA=8C=E3=80=81=E4=B8=89?= =?UTF-8?q?=E7=BA=A7=E8=BF=94=E7=8E=B0=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82#I4J4KP=20=E3=80=90=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E5=BB=B6=E9=95=BF=E5=90=8E=E7=AB=AF=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=90=8E=E7=94=A8=E6=88=B7=E5=9C=A8=E7=BA=BF=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=97=B6=E9=95=BF=E3=80=82=E4=BB=8E1=E5=B0=8F=E6=97=B6?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA24=E5=B0=8F=E6=97=B6=E3=80=82=20?= =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E8=B0=83=E6=95=B4=E5=A4=87?= =?UTF-8?q?=E6=A1=88=E8=B0=83=E7=94=A8=E6=95=B0=E6=8D=AE=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=90=8D=E5=A4=A7=E5=B0=8F=E5=86=99=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?#I4JNC2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Auth/AuthorizationSetup.cs | 2 +- .../SystemSettingConstVars.cs | 2 +- .../SystemSettingDictionary.cs | 2 +- .../Good/CoreCmsGoodsRepository.cs | 45 +- .../Shop/CoreCmsPagesServices.cs | 118 + .../coreshop-copyright/coreshop-copyright.vue | 4 +- .../coreshop-page/coreshop-goodTabBar.vue | 156 ++ .../components/coreshop-page/coreshop.vue | 4 + CoreCms.Net.Web.Admin/NLog.config | 2 +- .../wwwroot/lib/custom/css/style.css | 1955 +++++++++++------ .../wwwroot/lib/custom/css/style.less | 367 ++++ .../wwwroot/lib/custom/css/style.min.css | 1 + .../wwwroot/lib/custom/js/main.js | 179 +- .../wwwroot/views/shop/pages/design.html | 137 +- .../wwwroot/views/shop/setting/index.html | 4 +- .../Controllers/CommonController.cs | 4 +- 16 files changed, 2287 insertions(+), 695 deletions(-) create mode 100644 CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goodTabBar.vue create mode 100644 CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.less create mode 100644 CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.min.css diff --git a/CoreCms.Net.Auth/AuthorizationSetup.cs b/CoreCms.Net.Auth/AuthorizationSetup.cs index e4312e6..8b99c02 100644 --- a/CoreCms.Net.Auth/AuthorizationSetup.cs +++ b/CoreCms.Net.Auth/AuthorizationSetup.cs @@ -60,7 +60,7 @@ namespace CoreCms.Net.Auth issuer,//发行人 audience,//听众 signingCredentials,//签名凭据 - expiration: TimeSpan.FromSeconds(60 * 60 * 1)//接口的过期时间 + expiration: TimeSpan.FromSeconds(60 * 60 * 24)//接口的过期时间 ); #endregion diff --git a/CoreCms.Net.Configuration/SystemSettingConstVars.cs b/CoreCms.Net.Configuration/SystemSettingConstVars.cs index 8a9a9ba..ab76046 100644 --- a/CoreCms.Net.Configuration/SystemSettingConstVars.cs +++ b/CoreCms.Net.Configuration/SystemSettingConstVars.cs @@ -34,7 +34,7 @@ namespace CoreCms.Net.Configuration /// /// 备案信息 /// - public const string ShopBeian = "shopBeian"; + public const string ShopBeiAn = "shopBeiAn"; /// /// 平台logo diff --git a/CoreCms.Net.Configuration/SystemSettingDictionary.cs b/CoreCms.Net.Configuration/SystemSettingDictionary.cs index 5bf6253..0c595f7 100644 --- a/CoreCms.Net.Configuration/SystemSettingDictionary.cs +++ b/CoreCms.Net.Configuration/SystemSettingDictionary.cs @@ -31,7 +31,7 @@ namespace CoreCms.Net.Configuration di.Add(SystemSettingConstVars.ShopName, new DictionaryKeyValues() { sKey = "平台名称", sValue = "核心内容管理系统" }); di.Add(SystemSettingConstVars.ShopDesc, new DictionaryKeyValues() { sKey = "平台描述", sValue = "平台描述会展示在前台及微信分享描述" }); di.Add(SystemSettingConstVars.ShopAddress, new DictionaryKeyValues() { sKey = "平台地址", sValue = "我的平台地址" }); - di.Add(SystemSettingConstVars.ShopBeian, new DictionaryKeyValues() { sKey = "备案信息", sValue = "网站备案信息" }); + di.Add(SystemSettingConstVars.ShopBeiAn, new DictionaryKeyValues() { sKey = "备案信息", sValue = "网站备案信息" }); di.Add(SystemSettingConstVars.ShopLogo, new DictionaryKeyValues() { sKey = "平台logo", sValue = "" }); di.Add(SystemSettingConstVars.ShopFavicon, new DictionaryKeyValues() { sKey = "Favicon图标", sValue = "" }); di.Add(SystemSettingConstVars.ShopDefaultImage, new DictionaryKeyValues() { sKey = "默认图", sValue = "" }); diff --git a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs index 4887c7c..29d26e5 100644 --- a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs +++ b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs @@ -519,7 +519,6 @@ namespace CoreCms.Net.Repository } }); - oldDistributions.ForEach(o => { var oldPost = oldPostProducts.Find(p => p.id == o.productsId); @@ -533,11 +532,53 @@ namespace CoreCms.Net.Repository } }); + //极端情况下，如果不存在三级佣金明细，则创建. + var newDt = new List(); + if (oldDistributions.Any()) + { + var ids = oldDistributions.Select(p => p.productsId).ToList(); + var oldNoDtProduts = oldPostProducts.Where(p => ids.Contains(p.id)).ToList(); + if (oldNoDtProduts.Any()) + { + oldNoDtProduts.ForEach(p => + { + var pd = new CoreCmsProductsDistribution(); + pd.createTime = DateTime.Now; + pd.productsSN = p.sn; + pd.levelOne = p.levelOne; + pd.levelTwo = p.levelTwo; + pd.levelThree = p.levelThree; + pd.productsId = p.id; + newDt.Add(pd); + }); + } + } + else + { + oldPostProducts.ForEach(p => + { + var pd = new CoreCmsProductsDistribution(); + pd.createTime = DateTime.Now; + pd.productsSN = p.sn; + pd.levelOne = p.levelOne; + pd.levelTwo = p.levelTwo; + pd.levelThree = p.levelThree; + pd.productsId = p.id; + newDt.Add(pd); + }); + } + var upOldData = await DbClient.Updateable(oldDataProducts).ExecuteCommandHasChangeAsync(); if (upOldData) { await DbClient.Updateable(oldDistributions).ExecuteCommandHasChangeAsync(); + if (newDt.Any()) + { + await DbClient.Insertable(newDt).ExecuteCommandAsync(); + } } + + } } else @@ -607,7 +648,7 @@ namespace CoreCms.Net.Repository await DbClient.Updateable().SetColumns(p => p.isDel == true).Where(p => p.goodsId == model.id).ExecuteCommandHasChangeAsync(); var newObj = entity.products.FirstOrDefault(); - if (newObj != null && newObj.id > 0) + if (newObj is { id: > 0 }) { var obj = products.Find(p => p.id == newObj.id); //obj.barcode = model.bn; diff --git a/CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs b/CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs index 79a0347..b3a4d7e 100644 --- a/CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs +++ b/CoreCms.Net.Services/Shop/CoreCmsPagesServices.cs @@ -272,6 +272,124 @@ namespace CoreCms.Net.Services { dto.parameters = (JObject)JsonConvert.DeserializeObject(item.parameters); } + else if (item.widgetCode == "goodTabBar") + { + JObject parameters = (JObject)JsonConvert.DeserializeObject(item.parameters); + + if (parameters != null && parameters.ContainsKey("list")) + { + var list = JArray.Parse(parameters["list"].ToString()); + var newList = new JArray(); + var count = 0; + foreach (var jToken in list) + { + var child = (JObject)jToken; + + child.Add("isShow", count == 0); + + var where = PredicateBuilder.True(); + where = where.And(p => p.isDel == false); + where = where.And(p => p.isMarketable == true); + + if (child != null && child.ContainsKey("type") && child["type"].ToString() == "auto") + { + //商品分类,同时取所有子分类 + if (child.ContainsKey("classifyId") && child["classifyId"].ObjectToInt(0) > 0) + { + var classifyId = child["classifyId"].ObjectToInt(0); + var childCats = await _goodsCategoryServices.QueryListByClauseAsync(p => p.parentId == classifyId); + var catIds = childCats != null && childCats.Any() + ? childCats.Select(p => p.id).ToList() + : new List(); + catIds.Add(classifyId); + + where = where.And(p => catIds.Contains(p.goodsCategoryId)); + //扩展分类 CoreCmsGoodsCategory + } + //品牌筛选 + if (child.ContainsKey("brandId") && child["brandId"].ObjectToInt(0) > 0) + { + var brandId = child["brandId"].ObjectToInt(0); + where = where.And(p => p.brandId == brandId); + } + + var limit = 0; + if (child.ContainsKey("limit") && child["limit"].ObjectToInt(0) > 0) + { + limit = child["limit"].ObjectToInt(0); + } + limit = limit > 0 ? limit : 10; + + var goods = await _goodsServices.QueryListByClauseAsync(where, limit, p => p.createTime, OrderByType.Desc, true); + if (goods != null && goods.Any()) + { + JArray result = JArray.FromObject(goods); + child.Remove("list"); + child.Add("list", result); + } + else + { + child.Remove("list"); + child.Add("list", new JArray()); + } + } + else + { + var orderBy = string.Empty; + string goodidsStr; + if (child != null && child.ContainsKey("list")) + { + JArray result = JArray.Parse(child["list"].ToString()); + var goodids = new List(); + foreach (var ss in result) //查找某个字段与值 + { + var goodid = ((JObject)ss)["id"].ObjectToInt(0); + if (goodid > 0) + { + goodids.Add(goodid); + } + } + where = where.And(p => goodids.Contains(p.id)); + if (goodids.Any()) + { + goodidsStr = string.Join(",", goodids); + //按照id序列打乱后的顺序排序 + if (AppSettingsConstVars.DbDbType == DbType.SqlServer.ToString()) + { + orderBy = " CHARINDEX(RTRIM(CAST(id as NCHAR)),'" + goodidsStr + "') "; + } + else if (AppSettingsConstVars.DbDbType == DbType.MySql.ToString()) + { + orderBy = " find_in_set(id,'" + goodidsStr + "') "; + } + } + } + var goods = await _goodsServices.QueryListByClauseAsync(where, orderBy); + if (goods != null && goods.Any()) + { + JArray result = JArray.FromObject(goods); + child.Remove("list"); + child.Add("list", result); + } + else + { + child.Remove("list"); + child.Add("list", new JArray()); + } + } + count++; + newList.Add(child); + } + + if (newList != null && newList.Any()) + { + parameters.Remove("list"); + parameters.Add("list", newList); + } + } + dto.parameters = parameters; + } + else if (item.widgetCode == "goods") { JObject parameters = (JObject)JsonConvert.DeserializeObject(item.parameters); diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-copyright/coreshop-copyright.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-copyright/coreshop-copyright.vue index e831c1f..1350e9c 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-copyright/coreshop-copyright.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-copyright/coreshop-copyright.vue @@ -4,7 +4,7 @@ Powered by CoreShop - 备案号：{{shopBeiAn}} + 备案号：{{shopBeiAn}} @@ -13,7 +13,7 @@ export default { data() { return { - shopBeiAn: this.$store.state.config.shopBeian || '', + shopBeiAn: this.$store.state.config.shopBeiAn || '', } } } diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goodTabBar.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goodTabBar.vue new file mode 100644 index 0000000..f82c990 --- /dev/null +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-goodTabBar.vue @@ -0,0 +1,156 @@ + + + + + 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 4874fac..3cc78d7 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop.vue @@ -23,6 +23,8 @@ + + @@ -56,6 +58,7 @@ import coreshopimgWindow from '@/components/coreshop-page/coreshop-imgWindow.vue' import coreshopimgSingle from '@/components/coreshop-page/coreshop-imgSingle.vue' import coreshopgoods from '@/components/coreshop-page/coreshop-goods.vue' + import coreshopgoodTabBar from '@/components/coreshop-page/coreshop-goodTabBar.vue' import coreshoparticle from '@/components/coreshop-page/coreshop-article.vue' import coreshoparticleClassify from '@/components/coreshop-page/coreshop-articleClassify.vue' import coreshopnavBar from '@/components/coreshop-page/coreshop-navBar.vue' @@ -80,6 +83,7 @@ coreshopimgWindow, coreshopimgSingle, coreshopgoods, + coreshopgoodTabBar, coreshoparticle, coreshoparticleClassify, coreshopnavBar, diff --git a/CoreCms.Net.Web.Admin/NLog.config b/CoreCms.Net.Web.Admin/NLog.config index 66ef622..dd97751 100644 --- a/CoreCms.Net.Web.Admin/NLog.config +++ b/CoreCms.Net.Web.Admin/NLog.config @@ -14,7 +14,7 @@ dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=127.0.0.1;Database=BaseMIS;User ID=sa;Password=123456" --> - + INSERT INTO SysNLogRecords (LogDate,LogLevel,LogType,LogTitle,Logger,Message,MachineName,MachineIp,NetRequestMethod diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.css b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.css index 8ee1266..1106536 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.css +++ b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.css @@ -1,660 +1,1295 @@ -@charset "UTF-8"; -/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */ - -/* Document - ========================================================================== */ - -/** - * 1. Correct the line height in all browsers. - * 2. Prevent adjustments of font size after orientation changes in - * IE on Windows Phone and in iOS. - */ - -html { line-height: 1.15; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ } - -/* Sections - ========================================================================== */ - -/** - * Remove the margin in all browsers (opinionated). - */ - -body { margin: 0; } - -/** - * Add the correct display in IE 9-. - */ - -article, aside, footer, header, nav, section { display: block; } - -/** - * Correct the font size and margin on `h1` elements within `section` and - * `article` contexts in Chrome, Firefox, and Safari. - */ - -h1 { font-size: 2em; margin: 0.67em 0; } - -/* Grouping content - ========================================================================== */ - -/** - * Add the correct display in IE 9-. - * 1. Add the correct display in IE. - */ - -figcaption, figure, main { /* 1 */ display: block; } - -/** - * Add the correct margin in IE 8. - */ - -figure { margin: 1em 40px; } - -/** - * 1. Add the correct box sizing in Firefox. - * 2. Show the overflow in Edge and IE. - */ - -hr { box-sizing: content-box; /* 1 */ height: 0; /* 1 */ overflow: visible; /* 2 */ } - -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -pre { font-family: monospace, monospace; /* 1 */ font-size: 1em; /* 2 */ } - -/* Text-level semantics - ========================================================================== */ - -/** - * 1. Remove the gray background on active links in IE 10. - * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. - */ - -a { background-color: transparent; /* 1 */ -webkit-text-decoration-skip: objects; /* 2 */ } - -/** - * 1. Remove the bottom border in Chrome 57- and Firefox 39-. - * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. - */ - -abbr[title] { border-bottom: none; /* 1 */ text-decoration: underline; /* 2 */ text-decoration: underline dotted; /* 2 */ } - -/** - * Prevent the duplicate application of `bolder` by the next rule in Safari 6. - */ - -b, strong { font-weight: inherit; } - -/** - * Add the correct font weight in Chrome, Edge, and Safari. - */ - -b, strong { font-weight: bolder; } - -/** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. - */ - -code, kbd, samp { font-family: monospace, monospace; /* 1 */ font-size: 1em; /* 2 */ } - -/** - * Add the correct font style in Android 4.3-. - */ - -dfn { font-style: italic; } - -/** - * Add the correct background and color in IE 9-. - */ - -mark { background-color: #ff0; color: #000; } - -/** - * Add the correct font size in all browsers. - */ - -small { font-size: 80%; } - -/** - * Prevent `sub` and `sup` elements from affecting the line height in - * all browsers. - */ - -sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } - -sub { bottom: -0.25em; } - -sup { top: -0.5em; } - -/* Embedded content - ========================================================================== */ - -/** - * Add the correct display in IE 9-. - */ - -audio, video { display: inline-block; } - - /** - * Add the correct display in iOS 4-7. - */ - - audio:not([controls]) { display: none; height: 0; } - -/** - * Remove the border on images inside links in IE 10-. - */ - -img { border-style: none; } - -/** - * Hide the overflow in IE. - */ - -svg:not(:root) { overflow: hidden; } - -/* Forms - ========================================================================== */ - -/** - * 1. Change the font styles in all browsers (opinionated). - * 2. Remove the margin in Firefox and Safari. - */ - -button, input, optgroup, select, textarea { font-family: sans-serif; /* 1 */ font-size: 100%; /* 1 */ line-height: 1.15; /* 1 */ margin: 0; /* 2 */ } - -/** - * Show the overflow in IE. - * 1. Show the overflow in Edge. - */ - -button, input { /* 1 */ overflow: visible; } - -/** - * Remove the inheritance of text transform in Edge, Firefox, and IE. - * 1. Remove the inheritance of text transform in Firefox. - */ - -button, select { /* 1 */ text-transform: none; } - -/** - * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` - * controls in Android 4. - * 2. Correct the inability to style clickable types in iOS and Safari. - */ - -button, html [type="button"], [type="reset"], [type="submit"] { -webkit-appearance: button; /* 2 */ } - - /** - * Remove the inner border and padding in Firefox. - */ - - button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner { border-style: none; padding: 0; } - - /** - * Restore the focus styles unset by the previous rule. - */ - - button:-moz-focusring, [type="button"]:-moz-focusring, [type="reset"]:-moz-focusring, [type="submit"]:-moz-focusring { outline: 1px dotted ButtonText; } - -/** - * Correct the padding in Firefox. - */ - -fieldset { padding: 0.35em 0.75em 0.625em; } - -/** - * 1. Correct the text wrapping in Edge and IE. - * 2. Correct the color inheritance from `fieldset` elements in IE. - * 3. Remove the padding so developers are not caught out when they zero out - * `fieldset` elements in all browsers. - */ - -legend { box-sizing: border-box; /* 1 */ color: inherit; /* 2 */ display: table; /* 1 */ max-width: 100%; /* 1 */ padding: 0; /* 3 */ white-space: normal; /* 1 */ } - -/** - * 1. Add the correct display in IE 9-. - * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. - */ - -progress { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ } - -/** - * Remove the default vertical scrollbar in IE. - */ - -textarea { overflow: auto; } - -/** - * 1. Add the correct box sizing in IE 10-. - * 2. Remove the padding in IE 10-. - */ - -[type="checkbox"], [type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ } - -/** - * Correct the cursor style of increment and decrement buttons in Chrome. - */ - -[type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button { height: auto; } - -/** - * 1. Correct the odd appearance in Chrome and Safari. - * 2. Correct the outline style in Safari. - */ - -[type="search"] { -webkit-appearance: textfield; /* 1 */ outline-offset: -2px; /* 2 */ } - - /** - * Remove the inner padding and cancel buttons in Chrome and Safari on macOS. - */ - - [type="search"]::-webkit-search-cancel-button, [type="search"]::-webkit-search-decoration { -webkit-appearance: none; } - -/** - * 1. Correct the inability to style clickable types in iOS and Safari. - * 2. Change font properties to `inherit` in Safari. - */ - -::-webkit-file-upload-button { -webkit-appearance: button; /* 1 */ font: inherit; /* 2 */ } - -/* Interactive - ========================================================================== */ - -/* - * Add the correct display in IE 9-. - * 1. Add the correct display in Edge, IE, and Firefox. - */ - -details, menu { display: block; } - -/* - * Add the correct display in all browsers. - */ - -summary { display: list-item; } - -/* Scripting - ========================================================================== */ - -/** - * Add the correct display in IE 9-. - */ - -canvas { display: inline-block; } - -/** - * Add the correct display in IE. - */ - -template { display: none; } - -/* Hidden - ========================================================================== */ - -/** - * Add the correct display in IE 10-. - */ - -[hidden] { display: none; } - -.clearfix:after { content: "."; display: block; clear: both; visibility: hidden; height: 0; font-size: 0; } - -::-moz-selection { background: #009688; color: #FFF; } - -::selection { background: #159b76; color: #FFF; } - -::-webkit-scrollbar { width: 6px; height: 6px; } - -::-webkit-scrollbar-thumb { border-radius: 10px; background-color: #bdbdbd; -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); } - -.twolist-hidden { display: -webkit-box; word-break: break-all; text-overflow: ellipsis; overflow: hidden; -webkit-box-orient: vertical; -webkit-line-clamp: 2; } - -.form-edit-wrapper { display: -webkit-box; display: -ms-flexbox; display: flex; width: 100%; min-width: 1200px; background: #FFF; -webkit-box-pack: justify; -ms-flex-pack: justify; justify-content: space-between; /*padding: 30px 40px;*/ -webkit-box-align: start; -ms-flex-align: start; align-items: flex-start; } - -/*.edit-body { height: auto; min-width: 400px; max-width: calc(100% - 700px); }*/ -.edit-body { height: auto; width: calc(100% - 700px); } - -/*.center-container { width: 375px; height: 688px; border: 1px solid #e9e9e9; box-shadow: 0 3px 10px #dcdcdc; position: relative; }*/ -.center-container { width: 375px; height: 806px; border: 1px solid #e9e9e9; box-shadow: 0 3px 10px #dcdcdc; position: relative; } - - .center-container .model-title { height: 88px; width: 100%; position: relative; } - - .center-container .model-title img { width: 100%; height: 100%; } - -.nav-aside { width: 300px; height: auto; position: relative; } - - .nav-aside .components-wrap { border: 1px solid #e9e9e9; padding: 10px; text-align: left; color: #666; } - - .nav-aside .components-wrap .components-title { padding: 5px; border-bottom: 1px solid #f0f0f0; margin-bottom: 35px; } - - .nav-aside .components-wrap .components-title .text { padding: 0 10px; border-left: 4px solid #ff7159; } -.recycle { position: absolute; top: 43px; right: 26px; } - .recycle ul { position: relative; } -.recycle-content { width: 55px; padding: 3px 0; margin: 5px; text-align: center; height: 45px; text-align: center; background-color: #FFF; border: 1px solid #ddd; font-size: 12px; color: #333; -webkit-transition: all 0.5s; transition: all 0.5s; } - .recycle-content .iconfont { font-size: 16px !important; margin-right: 0px !important; margin-bottom: 3px; } - .recycle-content .text { margin-top: 5px; } -.recycle ul li.component-item-li { display: none; } -.recycle ul .layout-main { position: absolute; width: 100%; height: 30px; top: 10px; left: 0; } -.recycle ul .ghost { background: #fff; border: 1px dashed #409eff; position: absolute; left: 0; line-height: 30px; height: 30px; overflow: hidden; list-style: none; font-size: 0; } - - .recycle ul .ghost::after { content: '删除组件'; display: block; background: #fff; position: absolute; text-align: center; top: 0; left: 0; right: 0; font-size: 12px; color: #000; z-index: 2000; } - -/* .recycle-content li.ghost::after { - -} */ - -.nav-aside .components-wrap .components-list { display: -webkit-box; display: -ms-flexbox; display: flex; } - - .nav-aside .components-wrap .components-list .component-item { padding: 10px; } - - .nav-aside .components-wrap .components-list .component-item-title { font-size: 12px; color: #999; margin: 10px 0; } - - .nav-aside .components-wrap .components-list .component-item ul { position: relative; overflow: hidden; padding: 0; margin: 0; } - - .nav-aside .components-wrap .components-list .component-item-li { width: 74px; float: left; padding: 3px 0; margin: 5px; text-align: center; height: 50px; text-align: center; display: block; background-color: #f5f5f5; border: 1px solid #ddd; font-size: 12px; color: #333; cursor: pointer; -webkit-transition: all 0.5s; transition: all 0.5s; } - - .nav-aside .components-wrap .components-list .component-item-li .iconfont { font-size: 20px !important; margin-bottom: 5px; margin-right: 0 !important } - - .nav-aside .components-wrap .components-list .component-item-li .text { padding: 0; margin-top: 5px; } - -.layout-list { height: 710px; overflow-y: scroll; } - - .layout-list .layout-main { position: relative; } - .layout-list .layout-main.npr { position: static !important; } - .layout-list .layout-main .drag { position: relative; } - .layout-list .layout-main.active .drag:before, .layout-main:hover .drag:before { content: ''; position: absolute; top: 0; left: 0; right: 0; bottom: 0; border: 2px dashed #ff7159; cursor: move; z-index: 1001; } - - .layout-list .layout-main .lay-item { display: -webkit-box; display: -ms-flexbox; display: flex; } - - .layout-list .layout-main .lay-notice { line-height: 32px; padding: 2px 10px; background: #fff; overflow: hidden; } - - .layout-list .layout-main .lay-notice .notice-right { height: 32px; overflow: hidden; } - - .layout-list .layout-main .lay-notice .notice-right .notice-text { text-overflow: ellipsis; overflow: hidden; white-space: nowrap; } - - .layout-list .layout-main .lay-notice .iconfont { color: #ff7159; margin-right: 2px; } - - .layout-list .layout-main .lay-guide .line { width: 100%; height: 0px; border-top: 1px solid #000; } - - .layout-list .layout-main .lay-textarea textarea { display: block; width: 100%; border: none; } -.lay-navBar { min-height: 88px; } -.layout-list .layout-main .lay-navBar.row3 .item { width: 33.3333%; } - -.layout-list .layout-main .lay-navBar.row4 .item { width: 25%; } - -.layout-list .layout-main .lay-navBar.row5 .item { width: 20%; } - -.layout-list .layout-main .lay-navBar .item { float: left; text-align: center; padding: 10px 0; } - -.layout-list .layout-main .lay-navBar .item-image { margin-bottom: 4px; text-align: center; } - - .layout-list .layout-main .lay-navBar .item-image img { height: 44px; width: 44px; object-fit: cover; } - -.layout-list .layout-main .lay-navBar .item-text { height: 20px; line-height: 20px; width: 70px; margin: 0 auto; text-align: center; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; } - -.lay-article { background: #f7f7f7; } - - .lay-article .article-wrap { width: 100%; height: 100px; padding: 15px; background: #FFF; } - - .lay-article .article-wrap:not(last-child) { margin-bottom: 10px; } - - .lay-article .article-wrap .article-left { float: left; height: 100%; width: 200px; } - -.savePageBtn { padding: 10px 13px; text-align: right; border-top: 1px dotted #ddd; } - -.lay-article .article-wrap .article-img { float: right; width: 120px; height: 70px; } - - .lay-article .article-wrap .article-img img { display: block; width: 120px; height: 100%; object-fit: cover; } - -.lay-special { height: 30px; align-items: center; } - - .lay-special .special-left { width: 70px; padding: 5px 10px; } - - .lay-special .special-left img { width: 100%; } - -.lay-goods { background: rgb(246, 246, 246); } - - .lay-goods .goods-head { height: 40px; display: flex; justify-content: space-between; align-items: center; background: #FFF; padding: 0 10px; } - - .lay-goods.list { height: auto; } - - .lay-goods.list .goods-item { float: left; } - - .lay-goods.slide { overflow-x: hidden; white-space: nowrap; width: auto; } - - .lay-goods.slide .goods-item { float: none; display: inline-block; } - - .lay-goods .goods-item.column2 { width: 50%; padding: 3px; } - - .lay-goods .goods-item.column1 { width: 100%; padding: 8px; height: 140px; display: flex; background: #FFF; margin-bottom: 8px; } - - .lay-goods .goods-item.column1 .goods-price { margin-top: 50px; } - - .lay-goods .goods-item.column3 { width: 33%; padding: 3px; } - - .lay-goods .goods-item.column1 .goods-image { width: 120px; height: 120px; padding: 0; } - - .lay-goods .goods-item.column1 .goods-detail { flex: 1; } - - .lay-goods .goods-item.column1 .goods-image img { width: 120px; height: 120px; padding: 0; } - - .lay-goods .goods-item .goods-image { position: relative; width: 100%; height: 0; padding-bottom: 100%; overflow: hidden; background: #fff; } - - .lay-goods .goods-item .goods-image:after { content: ''; display: block; margin-top: 100%; } - - .lay-goods .goods-item .goods-image img { position: absolute; width: 100%; height: 100%; top: 0; left: 0; -o-object-fit: cover; object-fit: cover; } - - .lay-goods .goods-item .goods-detail { padding: 4px; background: #fff; font-size: 13px; } - - .lay-goods .goods-item .goods-detail .goods-name { height: 40px; overflow: hidden; margin-bottom: 5px; } - - .lay-goods .goods-item .goods-detail .goods-price { font-size: 15px; color: red; } - - .lay-goods.group { background: #FFF; padding: 10px; } - - .lay-goods .group-item { width: 300px; padding: 10px; position: relative; background: rgb(246, 246, 246); height: 120px; display: inline-block; margin-right: 15px; } - - .lay-goods .group-item .group-image { width: 98px; height: 98px; position: absolute; left: 10px; top: 10px; } - - .lay-goods .group-item .group-image img { width: 100%; height: 100%; object-fit: cover; } - - .lay-goods .group-item .group-detail { position: absolute; top: 10px; left: 120px; bottom: 10px; right: 0; } - - .lay-goods .group-item .group-detail .group-price { position: absolute; top: 50px; left: 0px; font-size: 18px; color: #ff7159; } - - .lay-goods .group-item .group-detail .group-time { position: absolute; bottom: 0px; left: 0px; font-size: 12px; } - - .lay-goods .group-item .group-detail .group-time span { color: #ff7159; padding: 3px; text-align: center; } - - .lay-goods .group-item .group-detail .group-time span.time { background: #FFF; } - - .lay-goods .group-item .group-detail .buy-icon { position: absolute; bottom: 0; right: 10px; display: block; width: 20px; height: 20px; } - - .lay-goods .group-item .group-detail .buy-icon img { width: 100%; } - -.layout-list .layout-main .lay-imgSingle .img-wrap { display: block; margin: 0; height: auto; flex: 1; position: relative; } - - .layout-list .layout-main .lay-imgSingle .img-wrap img { display: block; width: 100%; } - .layout-list .layout-main .lay-imgSingle .img-wrap .img-btn { display: block; position: absolute; bottom: 25px; left: 40px; width: 80px; height: 30px; line-height: 30px; text-align: center; } - -.lay-service { width: 50px; height: 50px; padding: 4px; position: absolute; bottom: 30px; right: 10px; } -.lay-record { width: 210px; background: rgba(0,0,0,0.25); position: absolute !important; top: 30%; z-index: 9999; cursor: pointer; } - .lay-record.left { left: 0; } - .lay-record.right { right: 0; } - .lay-record:before { cursor: pointer !important } -.record-item { height: 30px; line-height: 30px; padding-left: 10px; } - .record-item .text { color: #ff7159; } -.lay-coupon { padding: 4px 12px; } - - .lay-coupon .coupon-item { width: 100%; box-sizing: border-box; background: linear-gradient(to right, #ff6565, #ff8a8a); margin: .1rem 0; border-radius: 5px; overflow: hidden; position: relative; } - - .lay-coupon .coupon-item .coupon-left { width: 28%; height: 50px; color: rgb(255, 247, 247); font-size: 12px; padding: 0 14px; float: left; margin: 12px 0; text-align: center; box-sizing: border-box; border-right: 1px dotted #fff; display: inline-block; } - - .lay-coupon .coupon-item .coupon-left p { position: relative; top: 50%; transform: translateY(-50%); } - - .lay-coupon .coupon-item .coupon-right { width: 50%; height: 100%; float: left; text-align: left; color: #fff; box-sizing: border-box; padding: 10px; display: inline-block; font-size: 12px; } - - .lay-coupon .coupon-item .coupon-right .conpon-f { font-size: 14px; } - - .lay-coupon .coupon-item .coupon-btn { padding: 0 8px; background-color: #ffe7e7; color: #ff5454; font-size: 12px; position: absolute; top: 50%; transform: translateY(-50%); right: 10px; border-radius: 2px; } - -.lay-imgWindow { min-height: 100px; } - .lay-imgWindow.row0 .display { height: 0; width: 100%; margin: 0; padding-bottom: 50%; position: relative; } - -.display img { width: 100%; height: 100%; } - -.display .display-left { width: 50%; height: 100%; position: absolute; top: 0; left: 0; } - -.display .display-right { width: 50%; height: 100%; position: absolute; top: 0; left: 50%; } - - .display .display-right .display-right1 { width: 100%; height: 50%; position: absolute; top: 0; left: 0; } - - .display .display-right .display-right2 { width: 100%; height: 50%; position: absolute; top: 50%; left: 0; } - - .display .display-right .display-right2 .left { width: 50%; height: 100%; position: absolute; top: 0; left: 0; } - - .display .display-right .display-right2 .right { width: 50%; height: 100%; position: absolute; top: 0; left: 50%; } - -.lay-imgWindow.row2 .img-wrap { width: 50%; height: 150px; } - -.lay-imgWindow.row3 .img-wrap { width: 33%; height: 150px; } - -.lay-imgWindow.row4 .img-wrap { width: 25%; height: 150px; } - -.lay-imgWindow .img-wrap { float: left; box-sizing: border-box; } - - .lay-imgWindow .img-wrap img { width: 100%; height: 100%; object-fit: cover; } - -.lay-video .video-wrap { width: 100%; z-index: 1200; } - - .lay-video .video-wrap video { display: block; width: 100%; } - -.layout-list .layout-main .lay-imgSlide .el-carousel { overflow: hidden !important; width: 100%; height: 175px !important; } - -.layout-list .layout-main .el-carousel__container { height: 175px !important; } - -.layout-list .layout-main .el-carousel__item { height: 175px !important; } - -.layout-list .layout-main .lay-search { width: 100%; height: 50px; padding: 7px 13px; } -.pl25 { padding-left: 25px; } -.custom-tip { margin-top: 40px; } - .custom-tip p { margin-bottom: 5px; } - -.layout-list .layout-main .lay-search-c { width: 100%; height: 100%; position: relative; } - -.layout-list .layout-main .lay-search-input { width: 100%; height: 100%; border-radius: 50px; background-color: #e9e9e9; border: none; padding: 0 15px; color: #999; cursor: move; } - - .layout-list .layout-main .lay-search-input.square { border-radius: 0; } - - .layout-list .layout-main .lay-search-input.radius { border-radius: 5px; } - - .layout-list .layout-main .lay-search-input.round { border-radius: 18px; } - -.layout-list .layout-main .lay-search .iconfont { position: absolute; top: 50%; -webkit-transform: translateY(-50%); -ms-transform: translateY(-50%); transform: translateY(-50%); right: 15px; color: #999; font-size: 18px !important; } - -.layout-list .layout-main .btn-clone { position: absolute; height: 18px; line-height: 18px; right: 50px; bottom: 2px; z-index: 90; width: 36px; text-align: center; font-size: 10px; color: #fff; background: #409eff; cursor: pointer; z-index: 1300; } - -.layout-list .layout-main .btn-delete { position: absolute; height: 18px; line-height: 18px; right: 2px; bottom: 2px; z-index: 90; width: 36px; text-align: center; font-size: 10px; color: #fff; background: rgba(0, 0, 0, 0.4); cursor: pointer; z-index: 1300; } - -.layout-list .ghost { background: #fff; border: 1px dashed #409eff; } - - .layout-list .ghost::after { background: #fff; } - -.layout-list li.ghost { position: relative; line-height: 30px; list-style: none; font-size: 0; } - -#selectGoods li { float: left; margin: 10px; height: 70px; width: 70px; background: #f7fafc; position: relative; border-radius: 3px; cursor: move; } - #selectGoods li img { width: 100%; height: 100%; object-fit: cover; } - #selectGoods li .icon-delete { position: absolute; top: -6px; right: -6px; border-radius: 50%; text-align: center; cursor: pointer; font-size: 18px; transition: background-color .3s ease-out, border-color .3s ease-out; -webkit-transition: background-color .3s ease-out, border-color .3s ease-out; } - #selectGoods li .icon-delete:hover { color: #000; } - - -#selectGroupPurchaseGoods li { float: left; margin: 10px; height: 100px; width: calc(100% - 20px); background: #f7fafc; position: relative; border-radius: 3px; cursor: move; } - #selectGroupPurchaseGoods li .left { float: left; width: 170px; height: 90px; } - #selectGroupPurchaseGoods li .right { float: left; width: calc(100% - 180px); height: 90px; margin-left: 10px; } - #selectGroupPurchaseGoods li .left img { width: 170px; height: 90px; object-fit: cover; } - #selectGroupPurchaseGoods li .icon-delete { position: absolute; top: -6px; right: -6px; border-radius: 50%; text-align: center; cursor: pointer; font-size: 18px; transition: background-color .3s ease-out, border-color .3s ease-out; -webkit-transition: background-color .3s ease-out, border-color .3s ease-out; } - #selectGroupPurchaseGoods li .icon-delete:hover { color: #000; } - - - -.layout-list li.ghost::after { content: '放到这里'; display: block; background: #fff; position: absolute; left: 50%; margin-left: -32px; top: 0; font-size: 16px; color: #999; z-index: 10; } - -.divider { height: 0; margin: 20px auto; overflow: hidden; clear: both; border-top: 1px dashed #ccc; } - -.el-color-picker { height: 24px !important; vertical-align: middle; } - -.el-color-picker__trigger { height: 24px !important; } - -.reset-color { display: inline-block; padding: 0 10px; border: 1px solid #bdbdbd; text-align: center; height: 20px; line-height: 20px; vertical-align: middle; margin-left: 5px; } - -.main-body { padding: 10px; border: 1px solid #e9e9e9; } - - .main-body .el-form-item { padding: 0px; margin-bottom: 0 !important; font-size: 12px !important; } - .main-body .el-form-item__label { font-size: 12px !important; line-height: 40px !important; } - .main-body .el-slider__runway { margin: 12px 0 !important; } - -.custom-item-t { padding: 5px; border-bottom: 1px solid #f0f0f0; margin-bottom: 15px; } - -.custom-item-t-c { padding: 0 10px; border-left: 4px solid #ff7159; text-align: left; } - -.custom-item .layui-form-label { box-sizing: content-box; } - -.custom-item .content { padding: 10px; } -.custom-item .drag-block { height: 30px; background: #F2F2F2; cursor: move; position: relative; } - .custom-item .drag-block .handle-icon { position: absolute; right: 0px; top: 0; width: 30px; height: 30px; line-height: 30px; text-align: center; cursor: pointer; } - - .custom-item .drag-block .handle-icon .iconfont { font-size: 16px !important; color: #999; margin: 0 auto; } - - .custom-item .drag-block .handle-icon .iconfont:hover { color: #ff7159; } - -.custom-item .content-item { position: relative; display: -webkit-box; display: -ms-flexbox; display: flex; margin-bottom: 5px; } - -.content-item .el-form-item { flex: 1; } -.custom-item li { border: 1px dashed #e9e9e9; } - .custom-item li.ghost { border-color: #ff7159; } -.content-item .el-radio-group .el-radio { margin-bottom: 10px; } -.el-select-dropdown__item.second span { padding-left: 15px !important; } -.number-input { width: 100%; padding: 5px; margin-bottom: 4px; border: 0; border-bottom: 1px solid #c2cad8; transition: all ease-in-out 0.15s } -.tpl-block { flex: 1; padding-left: 20px; } -.tpl-item { width: 75px; height: 75px; display: inline-block; border: 1px solid #e5e5e5; margin: 0 10px 15px 0; padding-top: 5px; background-color: #fff; text-align: center; cursor: pointer; } - .tpl-item.active { border: 1px solid #ff7159; } - .tpl-item .tpl-item-image { height: 40px; } - .tpl-item .tpl-item-image img { height: auto; width: 60px; margin: 0 auto; vertical-align: middle; } - .tpl-item .tpl-item-text { margin-top: 10px; font-size: 12px; } -.selectLinkVal { width: 100%; padding: 0px 10px; color: #555; height: 30px; line-height: 30px; margin-top: 5px; border: 1px solid #bdbdbd; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; font-size: 12px; } - -.layout-select { width: 100%; padding: 5px 6px; color: #555; line-height: 1.5; margin-bottom: 4px; } -.el-select { width: 100% !important; } -.el-input__inner, .el-textarea__inner { border-radius: 0 !important; border: 1px solid #bdbdbd !important; height: 30px !important; line-height: 30px !important; padding: 0 10px !important; font-size: 12px !important; } - -.number-input:focus { border-color: #ff7159; } - -.ml20 { margin-left: 20px; } - -.layout-tip { color: #838fa1; font-size: 12px; } - -.custom-item .content-item .item-label { width: 90px; } - -.custom-item .content-item .el-input { -webkit-box-flex: 1; -ms-flex: 1; flex: 1; } - - - -.custom-item .addImg { width: 100%; height: 32px; line-height: 32px; text-align: left; border: 1px dashed #e9e9e9; margin-top: 15px; cursor: pointer; padding-left: 5px; } - .custom-item .addImg .iconfont { font-size: 12px !important; margin-right: 5px !important; } - - .custom-item .addImg:hover { color: #ff7159; } - -body { padding: 20px; } - -html { box-sizing: border-box; } - -*, *:before, *:after { box-sizing: inherit; } - -.layui-nav .layui-nav-item { box-sizing: content-box; } - -.nav-aside .components-wrap .components-list .component-item-li { height: auto; } -.recycle-content { height: auto; } +html { + line-height: 1.15; + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; + box-sizing: border-box; +} +body { + margin: 0; + padding: 20px; +} +article, +aside, +footer, +header, +nav, +section { + display: block; +} +h1 { + font-size: 2em; + margin: 0.67em 0; +} +figcaption, +figure, +main { + display: block; +} +figure { + margin: 1em 40px; +} +hr { + box-sizing: content-box; + height: 0; + overflow: visible; +} +pre { + font-family: monospace, monospace; + font-size: 1em; +} +a { + background-color: transparent; + -webkit-text-decoration-skip: objects; +} +abbr[title] { + border-bottom: none; + text-decoration: underline; + text-decoration: underline dotted; +} +b, +strong { + font-weight: inherit; + font-weight: bolder; +} +code, +kbd, +samp { + font-family: monospace, monospace; + font-size: 1em; +} +dfn { + font-style: italic; +} +mark { + background-color: #ff0; + color: #000; +} +small { + font-size: 80%; +} +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} +sub { + bottom: -0.25em; +} +sup { + top: -0.5em; +} +audio, +video { + display: inline-block; +} +audio:not([controls]) { + display: none; + height: 0; +} +img { + border-style: none; +} +svg:not(:root) { + overflow: hidden; +} +button, +input, +optgroup, +select, +textarea { + font-family: sans-serif; + font-size: 100%; + line-height: 1.15; + margin: 0; +} +button, +input { + overflow: visible; +} +button, +select { + text-transform: none; +} +button, +html [type="button"], +[type="reset"], +[type="submit"] { + -webkit-appearance: button; +} +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} +fieldset { + padding: 0.35em 0.75em 0.625em; +} +legend { + box-sizing: border-box; + color: inherit; + display: table; + max-width: 100%; + padding: 0; + white-space: normal; +} +progress { + display: inline-block; + vertical-align: baseline; +} +textarea { + overflow: auto; +} +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; + padding: 0; +} +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} +[type="search"] { + -webkit-appearance: textfield; + outline-offset: -2px; +} +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} +::-webkit-file-upload-button { + -webkit-appearance: button; + font: inherit; +} +details, +menu { + display: block; +} +summary { + display: list-item; +} +canvas { + display: inline-block; +} +template { + display: none; +} +[hidden] { + display: none; +} +.clearfix:after { + content: "."; + display: block; + clear: both; + visibility: hidden; + height: 0; + font-size: 0; +} +::-moz-selection { + background: #009688; + color: #fff; +} +::selection { + background: #159b76; + color: #fff; +} +::-webkit-scrollbar { + width: 6px; + height: 6px; +} +::-webkit-scrollbar-thumb { + border-radius: 10px; + background-color: #bdbdbd; + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); +} +.twolist-hidden { + display: -webkit-box; + word-break: break-all; + text-overflow: ellipsis; + overflow: hidden; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; +} +.form-edit-wrapper { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + width: 100%; + min-width: 1200px; + background: #fff; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + -webkit-box-align: start; + -ms-flex-align: start; + align-items: flex-start; +} +.edit-body { + height: auto; + width: calc(100% - 700px); +} +.center-container { + width: 375px; + height: 806px; + border: 1px solid #e9e9e9; + box-shadow: 0 3px 10px #dcdcdc; + position: relative; +} +.center-container .model-title { + height: 88px; + width: 100%; + position: relative; +} +.center-container .model-title img { + width: 100%; + height: 100%; +} +.nav-aside { + width: 300px; + height: auto; + position: relative; +} +.nav-aside .components-wrap { + border: 1px solid #e9e9e9; + padding: 10px; + text-align: left; + color: #666; +} +.nav-aside .components-wrap .components-title { + padding: 5px; + border-bottom: 1px solid #f0f0f0; + margin-bottom: 35px; +} +.nav-aside .components-wrap .components-title .text { + padding: 0 10px; + border-left: 4px solid #ff7159; +} +.nav-aside .components-wrap .components-list { + display: -webkit-box; + display: -ms-flexbox; + display: flex; +} +.nav-aside .components-wrap .components-list .component-item { + padding: 10px; +} +.nav-aside .components-wrap .components-list .component-item ul { + position: relative; + overflow: hidden; + padding: 0; + margin: 0; +} +.nav-aside .components-wrap .components-list .component-item-title { + font-size: 12px; + color: #999; + margin: 10px 0; +} +.nav-aside .components-wrap .components-list .component-item-li { + width: 74px; + float: left; + padding: 3px 0; + margin: 5px; + height: 50px; + text-align: center; + display: block; + background-color: #f5f5f5; + border: 1px solid #ddd; + font-size: 12px; + color: #333; + cursor: pointer; + -webkit-transition: all 0.5s; + transition: all 0.5s; + height: auto; +} +.nav-aside .components-wrap .components-list .component-item-li .iconfont { + font-size: 20px !important; + margin-bottom: 5px; + margin-right: 0 !important; +} +.nav-aside .components-wrap .components-list .component-item-li .text { + padding: 0; + margin-top: 5px; +} +.recycle { + position: absolute; + top: 43px; + right: 26px; +} +.recycle ul { + position: relative; +} +.recycle ul li.component-item-li { + display: none; +} +.recycle ul .layout-main { + position: absolute; + width: 100%; + height: 30px; + top: 10px; + left: 0; +} +.recycle ul .ghost { + background: #fff; + border: 1px dashed #409eff; + position: absolute; + left: 0; + line-height: 30px; + height: 30px; + overflow: hidden; + list-style: none; + font-size: 0; +} +.recycle ul .ghost::after { + content: '删除组件'; + display: block; + background: #fff; + position: absolute; + text-align: center; + top: 0; + left: 0; + right: 0; + font-size: 12px; + color: #000; + z-index: 2000; +} +.recycle-content { + width: 55px; + padding: 3px 0; + margin: 5px; + height: 45px; + text-align: center; + background-color: #fff; + border: 1px solid #ddd; + font-size: 12px; + color: #333; + -webkit-transition: all 0.5s; + transition: all 0.5s; + height: auto; +} +.recycle-content .iconfont { + font-size: 16px !important; + margin-right: 0px !important; + margin-bottom: 3px; +} +.recycle-content .text { + margin-top: 5px; +} +.layout-list { + height: 710px; + overflow-y: scroll; +} +.layout-list .layout-main { + position: relative; +} +.layout-list .layout-main.npr { + position: static !important; +} +.layout-list .layout-main .drag { + position: relative; +} +.layout-list .layout-main .lay-item { + display: -webkit-box; + display: -ms-flexbox; + display: flex; +} +.layout-list .layout-main .lay-notice { + line-height: 32px; + padding: 2px 10px; + background: #fff; + overflow: hidden; +} +.layout-list .layout-main .lay-notice .notice-right { + height: 32px; + overflow: hidden; +} +.layout-list .layout-main .lay-notice .notice-right .notice-text { + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; +} +.layout-list .layout-main .lay-notice .iconfont { + color: #ff7159; + margin-right: 2px; +} +.layout-list .layout-main .lay-guide .line { + width: 100%; + height: 0px; + border-top: 1px solid #000; +} +.layout-list .layout-main .lay-textarea textarea { + display: block; + width: 100%; + border: none; +} +.layout-list .layout-main .lay-navBar.row3 .item { + width: 33.3333%; +} +.layout-list .layout-main .lay-navBar.row4 .item { + width: 25%; +} +.layout-list .layout-main .lay-navBar.row5 .item { + width: 20%; +} +.layout-list .layout-main .lay-navBar .item { + float: left; + text-align: center; + padding: 10px 0; +} +.layout-list .layout-main .lay-navBar .item-image { + margin-bottom: 4px; + text-align: center; +} +.layout-list .layout-main .lay-navBar .item-image img { + height: 44px; + width: 44px; + object-fit: cover; +} +.layout-list .layout-main .lay-navBar .item-text { + height: 20px; + line-height: 20px; + width: 70px; + margin: 0 auto; + text-align: center; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; +} +.layout-list .layout-main .lay-imgSingle .img-wrap { + display: block; + margin: 0; + height: auto; + flex: 1; + position: relative; +} +.layout-list .layout-main .lay-imgSingle .img-wrap img { + display: block; + width: 100%; +} +.layout-list .layout-main .lay-imgSingle .img-wrap .img-btn { + display: block; + position: absolute; + bottom: 25px; + left: 40px; + width: 80px; + height: 30px; + line-height: 30px; + text-align: center; +} +.layout-list .layout-main .lay-imgSlide .el-carousel { + overflow: hidden !important; + width: 100%; + height: 175px !important; +} +.layout-list .layout-main .el-carousel__container { + height: 175px !important; +} +.layout-list .layout-main .el-carousel__item { + height: 175px !important; +} +.layout-list .layout-main .lay-search { + width: 100%; + height: 50px; + padding: 7px 13px; +} +.layout-list .layout-main .lay-search .iconfont { + position: absolute; + top: 50%; + -webkit-transform: translateY(-50%); + -ms-transform: translateY(-50%); + transform: translateY(-50%); + right: 15px; + color: #999; + font-size: 18px !important; +} +.layout-list .layout-main .lay-search-c { + width: 100%; + height: 100%; + position: relative; +} +.layout-list .layout-main .lay-search-input { + width: 100%; + height: 100%; + border-radius: 50px; + background-color: #e9e9e9; + border: none; + padding: 0 15px; + color: #999; + cursor: move; +} +.layout-list .layout-main .lay-search-input.square { + border-radius: 0; +} +.layout-list .layout-main .lay-search-input.radius { + border-radius: 5px; +} +.layout-list .layout-main .lay-search-input.round { + border-radius: 18px; +} +.layout-list .layout-main .btn-clone { + position: absolute; + height: 18px; + line-height: 18px; + right: 50px; + bottom: 2px; + z-index: 90; + width: 36px; + text-align: center; + font-size: 10px; + color: #fff; + background: #409eff; + cursor: pointer; + z-index: 1300; +} +.layout-list .layout-main .btn-delete { + position: absolute; + height: 18px; + line-height: 18px; + right: 2px; + bottom: 2px; + z-index: 90; + width: 36px; + text-align: center; + font-size: 10px; + color: #fff; + background: rgba(0, 0, 0, 0.4); + cursor: pointer; + z-index: 1300; +} +.layout-list .ghost { + background: #fff; + border: 1px dashed #409eff; +} +.layout-list .ghost::after { + background: #fff; +} +.layout-list li.ghost { + position: relative; + line-height: 30px; + list-style: none; + font-size: 0; +} +.layout-list li.ghost::after { + content: '放到这里'; + display: block; + background: #fff; + position: absolute; + left: 50%; + margin-left: -32px; + top: 0; + font-size: 16px; + color: #999; + z-index: 10; +} +.layout-list .layout-main.active .drag:before, +.layout-main:hover .drag:before { + content: ''; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border: 2px dashed #ff7159; + cursor: move; + z-index: 1001; +} +.lay-navBar { + min-height: 88px; +} +.lay-article { + background: #f7f7f7; +} +.lay-article .article-wrap { + width: 100%; + height: 100px; + padding: 15px; + background: #fff; +} +.lay-article .article-wrap:not(last-child) { + margin-bottom: 10px; +} +.lay-article .article-wrap .article-left { + float: left; + height: 100%; + width: 200px; +} +.lay-article .article-wrap .article-img { + float: right; + width: 120px; + height: 70px; +} +.lay-article .article-wrap .article-img img { + display: block; + width: 120px; + height: 100%; + object-fit: cover; +} +.savePageBtn { + padding: 10px 13px; + text-align: right; + border-top: 1px dotted #ddd; +} +.lay-special { + height: 30px; + align-items: center; +} +.lay-special .special-left { + width: 70px; + padding: 5px 10px; +} +.lay-special .special-left img { + width: 100%; +} +.lay-goods { + background: #f6f6f6; +} +.lay-goods .goods-head { + height: 40px; + display: flex; + justify-content: space-between; + align-items: center; + background: #fff; + padding: 0 10px; +} +.lay-goods .goods-tab-head { + min-height: 40px; + display: inline-block; + justify-content: flex-start; + align-items: center; + background: #fff; + padding: 0 10px; +} +.lay-goods .goods-tab-head div { + padding: 3px 10px; + background: #e9e9e9; + border-radius: 10px; + margin: 5px 5px; + float: left; +} +.lay-goods.list { + height: auto; +} +.lay-goods.list .goods-item { + float: left; +} +.lay-goods.slide { + overflow-x: hidden; + white-space: nowrap; + width: auto; +} +.lay-goods.slide .goods-item { + float: none; + display: inline-block; +} +.lay-goods .goods-item.column2 { + width: 50%; + padding: 3px; + float: left; +} +.lay-goods .goods-item.column1 { + width: 100%; + padding: 8px; + height: 140px; + display: flex; + background: #fff; + margin-bottom: 8px; +} +.lay-goods .goods-item.column1 .goods-price { + margin-top: 50px; +} +.lay-goods .goods-item.column1 .goods-image { + width: 120px; + height: 120px; + padding: 0; +} +.lay-goods .goods-item.column1 .goods-image img { + width: 120px; + height: 120px; + padding: 0; +} +.lay-goods .goods-item.column1 .goods-detail { + flex: 1; +} +.lay-goods .goods-item.column3 { + width: 33%; + padding: 3px; +} +.lay-goods .goods-item .goods-image { + position: relative; + width: 100%; + height: 0; + padding-bottom: 100%; + overflow: hidden; + background: #fff; +} +.lay-goods .goods-item .goods-image:after { + content: ''; + display: block; + margin-top: 100%; +} +.lay-goods .goods-item .goods-image img { + position: absolute; + width: 100%; + height: 100%; + top: 0; + left: 0; + -o-object-fit: cover; + object-fit: cover; +} +.lay-goods .goods-item .goods-detail { + padding: 4px; + background: #fff; + font-size: 13px; +} +.lay-goods .goods-item .goods-detail .goods-name { + height: 40px; + overflow: hidden; + margin-bottom: 5px; +} +.lay-goods .goods-item .goods-detail .goods-price { + font-size: 15px; + color: red; +} +.lay-goods.group { + background: #fff; + padding: 10px; +} +.lay-goods .group-item { + width: 300px; + padding: 10px; + position: relative; + background: #f6f6f6; + height: 120px; + display: inline-block; + margin-right: 15px; +} +.lay-goods .group-item .group-image { + width: 98px; + height: 98px; + position: absolute; + left: 10px; + top: 10px; +} +.lay-goods .group-item .group-image img { + width: 100%; + height: 100%; + object-fit: cover; +} +.lay-goods .group-item .group-detail { + position: absolute; + top: 10px; + left: 120px; + bottom: 10px; + right: 0; +} +.lay-goods .group-item .group-detail .group-price { + position: absolute; + top: 50px; + left: 0px; + font-size: 18px; + color: #ff7159; +} +.lay-goods .group-item .group-detail .group-time { + position: absolute; + bottom: 0px; + left: 0px; + font-size: 12px; +} +.lay-goods .group-item .group-detail .group-time span { + color: #ff7159; + padding: 3px; + text-align: center; +} +.lay-goods .group-item .group-detail .group-time span.time { + background: #fff; +} +.lay-goods .group-item .group-detail .buy-icon { + position: absolute; + bottom: 0; + right: 10px; + display: block; + width: 20px; + height: 20px; +} +.lay-goods .group-item .group-detail .buy-icon img { + width: 100%; +} +.lay-service { + width: 50px; + height: 50px; + padding: 4px; + position: absolute; + bottom: 30px; + right: 10px; +} +.lay-record { + width: 210px; + background: rgba(0, 0, 0, 0.25); + position: absolute !important; + top: 30%; + z-index: 9999; + cursor: pointer; +} +.lay-record.left { + left: 0; +} +.lay-record.right { + right: 0; +} +.lay-record:before { + cursor: pointer !important; +} +.record-item { + height: 30px; + line-height: 30px; + padding-left: 10px; +} +.record-item .text { + color: #ff7159; +} +.lay-coupon { + padding: 4px 12px; +} +.lay-coupon .coupon-item { + width: 100%; + box-sizing: border-box; + background: linear-gradient(to right, #ff6565, #ff8a8a); + margin: 0.1rem 0; + border-radius: 5px; + overflow: hidden; + position: relative; +} +.lay-coupon .coupon-item .coupon-left { + width: 28%; + height: 50px; + color: #fff7f7; + font-size: 12px; + padding: 0 14px; + float: left; + margin: 12px 0; + text-align: center; + box-sizing: border-box; + border-right: 1px dotted #fff; + display: inline-block; +} +.lay-coupon .coupon-item .coupon-left p { + position: relative; + top: 50%; + transform: translateY(-50%); +} +.lay-coupon .coupon-item .coupon-right { + width: 50%; + height: 100%; + float: left; + text-align: left; + color: #fff; + box-sizing: border-box; + padding: 10px; + display: inline-block; + font-size: 12px; +} +.lay-coupon .coupon-item .coupon-right .conpon-f { + font-size: 14px; +} +.lay-coupon .coupon-item .coupon-btn { + padding: 0 8px; + background-color: #ffe7e7; + color: #ff5454; + font-size: 12px; + position: absolute; + top: 50%; + transform: translateY(-50%); + right: 10px; + border-radius: 2px; +} +.lay-imgWindow { + min-height: 100px; +} +.lay-imgWindow.row0 .display { + height: 0; + width: 100%; + margin: 0; + padding-bottom: 50%; + position: relative; +} +.lay-imgWindow.row2 .img-wrap { + width: 50%; + height: 150px; +} +.lay-imgWindow.row3 .img-wrap { + width: 33%; + height: 150px; +} +.lay-imgWindow.row4 .img-wrap { + width: 25%; + height: 150px; +} +.lay-imgWindow .img-wrap { + float: left; + box-sizing: border-box; +} +.lay-imgWindow .img-wrap img { + width: 100%; + height: 100%; + object-fit: cover; +} +.display img { + width: 100%; + height: 100%; +} +.display .display-left { + width: 50%; + height: 100%; + position: absolute; + top: 0; + left: 0; +} +.display .display-right { + width: 50%; + height: 100%; + position: absolute; + top: 0; + left: 50%; +} +.display .display-right .display-right1 { + width: 100%; + height: 50%; + position: absolute; + top: 0; + left: 0; +} +.display .display-right .display-right2 { + width: 100%; + height: 50%; + position: absolute; + top: 50%; + left: 0; +} +.display .display-right .display-right2 .left { + width: 50%; + height: 100%; + position: absolute; + top: 0; + left: 0; +} +.display .display-right .display-right2 .right { + width: 50%; + height: 100%; + position: absolute; + top: 0; + left: 50%; +} +.lay-video .video-wrap { + width: 100%; + z-index: 1200; +} +.lay-video .video-wrap video { + display: block; + width: 100%; +} +.pl25 { + padding-left: 25px; +} +.custom-tip { + margin-top: 40px; +} +.custom-tip p { + margin-bottom: 5px; +} +#selectGoods li { + float: left; + margin: 10px; + height: 70px; + width: 70px; + background: #f7fafc; + position: relative; + border-radius: 3px; + cursor: move; +} +#selectGoods li img { + width: 100%; + height: 100%; + object-fit: cover; +} +#selectGoods li .icon-delete { + position: absolute; + top: -6px; + right: -6px; + border-radius: 50%; + text-align: center; + cursor: pointer; + font-size: 18px; + transition: background-color 0.3s ease-out, border-color 0.3s ease-out; + -webkit-transition: background-color 0.3s ease-out, border-color 0.3s ease-out; +} +#selectGoods li .icon-delete:hover { + color: #000; +} +#selectGroupPurchaseGoods li { + float: left; + margin: 10px; + height: 100px; + width: calc(100% - 20px); + background: #f7fafc; + position: relative; + border-radius: 3px; + cursor: move; +} +#selectGroupPurchaseGoods li .left { + float: left; + width: 170px; + height: 90px; +} +#selectGroupPurchaseGoods li .left img { + width: 170px; + height: 90px; + object-fit: cover; +} +#selectGroupPurchaseGoods li .right { + float: left; + width: calc(100% - 180px); + height: 90px; + margin-left: 10px; +} +#selectGroupPurchaseGoods li .icon-delete { + position: absolute; + top: -6px; + right: -6px; + border-radius: 50%; + text-align: center; + cursor: pointer; + font-size: 18px; + transition: background-color 0.3s ease-out, border-color 0.3s ease-out; + -webkit-transition: background-color 0.3s ease-out, border-color 0.3s ease-out; +} +#selectGroupPurchaseGoods li .icon-delete:hover { + color: #000; +} +.divider { + height: 0; + margin: 20px auto; + overflow: hidden; + clear: both; + border-top: 1px dashed #ccc; +} +.el-color-picker { + height: 24px !important; + vertical-align: middle; +} +.el-color-picker__trigger { + height: 24px !important; +} +.reset-color { + display: inline-block; + padding: 0 10px; + border: 1px solid #bdbdbd; + text-align: center; + height: 20px; + line-height: 20px; + vertical-align: middle; + margin-left: 5px; +} +.main-body { + padding: 10px; + border: 1px solid #e9e9e9; +} +.main-body .el-form-item { + padding: 0px; + margin-bottom: 0 !important; + font-size: 12px !important; +} +.main-body .el-form-item__label { + font-size: 12px !important; + line-height: 40px !important; +} +.main-body .el-slider__runway { + margin: 12px 0 !important; +} +.custom-item-t { + padding: 5px; + border-bottom: 1px solid #f0f0f0; + margin-bottom: 15px; +} +.custom-item-t-c { + padding: 0 10px; + border-left: 4px solid #ff7159; + text-align: left; +} +.custom-item .layui-form-label { + box-sizing: content-box; +} +.custom-item .content { + padding: 10px; +} +.custom-item .drag-block { + height: 30px; + background: #f2f2f2; + cursor: move; + position: relative; +} +.custom-item .drag-block .handle-icon { + position: absolute; + right: 0px; + top: 0; + width: 30px; + height: 30px; + line-height: 30px; + text-align: center; + cursor: pointer; +} +.custom-item .drag-block .handle-icon .iconfont { + font-size: 16px !important; + color: #999; + margin: 0 auto; +} +.custom-item .drag-block .handle-icon .iconfont:hover { + color: #ff7159; +} +.custom-item .content-item { + position: relative; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + margin-bottom: 5px; +} +.custom-item .content-item .item-label { + width: 90px; +} +.custom-item .content-item .el-input { + -webkit-box-flex: 1; + -ms-flex: 1; + flex: 1; +} +.custom-item li { + border: 1px dashed #e9e9e9; +} +.custom-item li.ghost { + border-color: #ff7159; +} +.custom-item .addImg { + width: 100%; + height: 32px; + line-height: 32px; + text-align: left; + border: 1px dashed #e9e9e9; + margin-top: 15px; + cursor: pointer; + padding-left: 5px; +} +.custom-item .addImg .iconfont { + font-size: 12px !important; + margin-right: 5px !important; +} +.custom-item .addImg:hover { + color: #ff7159; +} +.content-item .el-form-item { + flex: 1; +} +.content-item .el-radio-group .el-radio { + margin-bottom: 10px; +} +.el-select-dropdown__item.second span { + padding-left: 15px !important; +} +.number-input { + width: 100%; + padding: 5px; + margin-bottom: 4px; + border: 0; + border-bottom: 1px solid #c2cad8; + transition: all ease-in-out 0.15s; +} +.number-input:focus { + border-color: #ff7159; +} +.tpl-block { + flex: 1; + padding-left: 20px; +} +.tpl-item { + width: 75px; + height: 75px; + display: inline-block; + border: 1px solid #e5e5e5; + margin: 0 10px 15px 0; + padding-top: 5px; + background-color: #fff; + text-align: center; + cursor: pointer; +} +.tpl-item.active { + border: 1px solid #ff7159; +} +.tpl-item .tpl-item-image { + height: 40px; +} +.tpl-item .tpl-item-image img { + height: auto; + width: 60px; + margin: 0 auto; + vertical-align: middle; +} +.tpl-item .tpl-item-text { + margin-top: 10px; + font-size: 12px; +} +.selectLinkVal { + width: 100%; + padding: 0px 10px; + color: #555; + height: 30px; + line-height: 30px; + margin-top: 5px; + border: 1px solid #bdbdbd; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + font-size: 12px; +} +.layout-select { + width: 100%; + padding: 5px 6px; + color: #555; + line-height: 1.5; + margin-bottom: 4px; +} +.el-select { + width: 100% !important; +} +.el-input__inner, +.el-textarea__inner { + border-radius: 0 !important; + border: 1px solid #bdbdbd !important; + height: 30px !important; + line-height: 30px !important; + padding: 0 10px !important; + font-size: 12px !important; +} +.ml20 { + margin-left: 20px; +} +.layout-tip { + color: #838fa1; + font-size: 12px; +} +*, +*:before, +*:after { + box-sizing: inherit; +} +.layui-nav .layui-nav-item { + box-sizing: content-box; +} +.tabBarItem { + border: 1px solid #e9e9e9; + margin-bottom: 10px; + padding: 10px; +} \ No newline at end of file diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.less b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.less new file mode 100644 index 0000000..a2e7afa --- /dev/null +++ b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.less @@ -0,0 +1,367 @@ +html { line-height: 1.15; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; box-sizing: border-box; } +body { margin: 0; padding: 20px; } +article, aside, footer, header, nav, section { display: block; } +h1 { font-size: 2em; margin: 0.67em 0; } +figcaption, figure, main { display: block; } +figure { margin: 1em 40px; } +hr { box-sizing: content-box; height: 0; overflow: visible; } +pre { font-family: monospace, monospace; font-size: 1em; } +a { background-color: transparent; -webkit-text-decoration-skip: objects; } +abbr[title] { border-bottom: none; text-decoration: underline; text-decoration: underline dotted; } +b, strong { font-weight: inherit; font-weight: bolder; } +code, kbd, samp { font-family: monospace, monospace; font-size: 1em; } +dfn { font-style: italic; } +mark { background-color: #ff0; color: #000; } +small { font-size: 80%; } +sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } +sub { bottom: -0.25em; } +sup { top: -0.5em; } +audio, video { display: inline-block; } +audio { + &:not([controls]) { display: none; height: 0; } +} +img { border-style: none; } +svg { + &:not(:root) { overflow: hidden; } +} +button, input, optgroup, select, textarea { font-family: sans-serif; font-size: 100%; line-height: 1.15; margin: 0; } +button, input { overflow: visible; } +button, select { text-transform: none; } +button, html [type="button"], [type="reset"], [type="submit"] { -webkit-appearance: button; } + button::-moz-focus-inner, [type="button"]::-moz-focus-inner, [type="reset"]::-moz-focus-inner, [type="submit"]::-moz-focus-inner { border-style: none; padding: 0; } + button:-moz-focusring, [type="button"]:-moz-focusring, [type="reset"]:-moz-focusring, [type="submit"]:-moz-focusring { outline: 1px dotted ButtonText; } +fieldset { padding: 0.35em 0.75em 0.625em; } +legend { box-sizing: border-box; color: inherit; display: table; max-width: 100%; padding: 0; white-space: normal; } +progress { display: inline-block; vertical-align: baseline; } +textarea { overflow: auto; } +[type="checkbox"], [type="radio"] { box-sizing: border-box; padding: 0; } +[type="number"]::-webkit-inner-spin-button, [type="number"]::-webkit-outer-spin-button { height: auto; } +[type="search"] { -webkit-appearance: textfield; outline-offset: -2px; } + [type="search"]::-webkit-search-cancel-button, [type="search"]::-webkit-search-decoration { -webkit-appearance: none; } +::-webkit-file-upload-button { -webkit-appearance: button; font: inherit; } +details, menu { display: block; } +summary { display: list-item; } +canvas { display: inline-block; } +template { display: none; } +[hidden] { display: none; } +.clearfix { + &:after { content: "."; display: block; clear: both; visibility: hidden; height: 0; font-size: 0; } +} +::-moz-selection { background: #009688; color: #fff; } +::selection { background: #159b76; color: #fff; } +::-webkit-scrollbar { width: 6px; height: 6px; } +::-webkit-scrollbar-thumb { border-radius: 10px; background-color: #bdbdbd; -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); } +.twolist-hidden { display: -webkit-box; word-break: break-all; text-overflow: ellipsis; overflow: hidden; -webkit-box-orient: vertical; -webkit-line-clamp: 2; } +.form-edit-wrapper { display: -webkit-box; display: -ms-flexbox; display: flex; width: 100%; min-width: 1200px; background: #fff; -webkit-box-pack: justify; -ms-flex-pack: justify; justify-content: space-between; -webkit-box-align: start; -ms-flex-align: start; align-items: flex-start; } +.edit-body { height: auto; width: calc(100% - 700px); } +.center-container { width: 375px; height: 806px; border: 1px solid #e9e9e9; box-shadow: 0 3px 10px #dcdcdc; position: relative; + .model-title { height: 88px; width: 100%; position: relative; + img { width: 100%; height: 100%; } + } +} +.nav-aside { width: 300px; height: auto; position: relative; + .components-wrap { border: 1px solid #e9e9e9; padding: 10px; text-align: left; color: #666; + .components-title { padding: 5px; border-bottom: 1px solid #f0f0f0; margin-bottom: 35px; + .text { padding: 0 10px; border-left: 4px solid #ff7159; } + } + .components-list { display: -webkit-box; display: -ms-flexbox; display: flex; + .component-item { padding: 10px; + ul { position: relative; overflow: hidden; padding: 0; margin: 0; } + } + .component-item-title { font-size: 12px; color: #999; margin: 10px 0; } + .component-item-li { width: 74px; float: left; padding: 3px 0; margin: 5px; text-align: center; height: 50px; text-align: center; display: block; background-color: #f5f5f5; border: 1px solid #ddd; font-size: 12px; color: #333; cursor: pointer; -webkit-transition: all 0.5s; transition: all 0.5s; height: auto; + .iconfont { font-size: 20px !important; margin-bottom: 5px; margin-right: 0 !important; } + .text { padding: 0; margin-top: 5px; } + } + } + } +} +.recycle { position: absolute; top: 43px; right: 26px; + ul { position: relative; + li { + &.component-item-li { display: none; } + } + .layout-main { position: absolute; width: 100%; height: 30px; top: 10px; left: 0; } + .ghost { background: #fff; border: 1px dashed #409eff; position: absolute; left: 0; line-height: 30px; height: 30px; overflow: hidden; list-style: none; font-size: 0; + &::after { content: '删除组件'; display: block; background: #fff; position: absolute; text-align: center; top: 0; left: 0; right: 0; font-size: 12px; color: #000; z-index: 2000; } + } + } +} +.recycle-content { width: 55px; padding: 3px 0; margin: 5px; text-align: center; height: 45px; text-align: center; background-color: #fff; border: 1px solid #ddd; font-size: 12px; color: #333; -webkit-transition: all 0.5s; transition: all 0.5s; height: auto; + .iconfont { font-size: 16px !important; margin-right: 0px !important; margin-bottom: 3px; } + .text { margin-top: 5px; } +} +.layout-list { height: 710px; overflow-y: scroll; + .layout-main { position: relative; + &.npr { position: static !important; } + .drag { position: relative; } + .lay-item { display: -webkit-box; display: -ms-flexbox; display: flex; } + .lay-notice { line-height: 32px; padding: 2px 10px; background: #fff; overflow: hidden; + .notice-right { height: 32px; overflow: hidden; + .notice-text { text-overflow: ellipsis; overflow: hidden; white-space: nowrap; } + } + .iconfont { color: #ff7159; margin-right: 2px; } + } + .lay-guide { + .line { width: 100%; height: 0px; border-top: 1px solid #000; } + } + .lay-textarea { + textarea { display: block; width: 100%; border: none; } + } + .lay-navBar { + &.row3 { + .item { width: 33.3333%; } + } + &.row4 { + .item { width: 25%; } + } + &.row5 { + .item { width: 20%; } + } + .item { float: left; text-align: center; padding: 10px 0; } + .item-image { margin-bottom: 4px; text-align: center; + img { height: 44px; width: 44px; object-fit: cover; } + } + .item-text { height: 20px; line-height: 20px; width: 70px; margin: 0 auto; text-align: center; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; } + } + .lay-imgSingle { + .img-wrap { display: block; margin: 0; height: auto; flex: 1; position: relative; + img { display: block; width: 100%; } + .img-btn { display: block; position: absolute; bottom: 25px; left: 40px; width: 80px; height: 30px; line-height: 30px; text-align: center; } + } + } + .lay-imgSlide { + .el-carousel { overflow: hidden !important; width: 100%; height: 175px !important; } + } + .el-carousel__container { height: 175px !important; } + .el-carousel__item { height: 175px !important; } + .lay-search { width: 100%; height: 50px; padding: 7px 13px; + .iconfont { position: absolute; top: 50%; -webkit-transform: translateY(-50%); -ms-transform: translateY(-50%); transform: translateY(-50%); right: 15px; color: #999; font-size: 18px !important; } + } + .lay-search-c { width: 100%; height: 100%; position: relative; } + .lay-search-input { width: 100%; height: 100%; border-radius: 50px; background-color: #e9e9e9; border: none; padding: 0 15px; color: #999; cursor: move; + &.square { border-radius: 0; } + &.radius { border-radius: 5px; } + &.round { border-radius: 18px; } + } + .btn-clone { position: absolute; height: 18px; line-height: 18px; right: 50px; bottom: 2px; z-index: 90; width: 36px; text-align: center; font-size: 10px; color: #fff; background: #409eff; cursor: pointer; z-index: 1300; } + .btn-delete { position: absolute; height: 18px; line-height: 18px; right: 2px; bottom: 2px; z-index: 90; width: 36px; text-align: center; font-size: 10px; color: #fff; background: rgba(0, 0, 0, 0.4); cursor: pointer; z-index: 1300; } + } + .ghost { background: #fff; border: 1px dashed #409eff; + &::after { background: #fff; } + } + li { + &.ghost { position: relative; line-height: 30px; list-style: none; font-size: 0; + &::after { content: '放到这里'; display: block; background: #fff; position: absolute; left: 50%; margin-left: -32px; top: 0; font-size: 16px; color: #999; z-index: 10; } + } + } +} + .layout-list .layout-main.active .drag:before, .layout-main:hover .drag:before { content: ''; position: absolute; top: 0; left: 0; right: 0; bottom: 0; border: 2px dashed #ff7159; cursor: move; z-index: 1001; } +.lay-navBar { min-height: 88px; } +.lay-article { background: #f7f7f7; + .article-wrap { width: 100%; height: 100px; padding: 15px; background: #fff; + &:not(last-child) { margin-bottom: 10px; } + .article-left { float: left; height: 100%; width: 200px; } + .article-img { float: right; width: 120px; height: 70px; + img { display: block; width: 120px; height: 100%; object-fit: cover; } + } + } +} +.savePageBtn { padding: 10px 13px; text-align: right; border-top: 1px dotted #ddd; } +.lay-special { height: 30px; align-items: center; + .special-left { width: 70px; padding: 5px 10px; + img { width: 100%; } + } +} +.lay-goods { background: rgb(246, 246, 246); + .goods-head { height: 40px; display: flex; justify-content: space-between; align-items: center; background: #fff; padding: 0 10px; } + .goods-tab-head { min-height: 40px; display: inline-block; justify-content: flex-start; align-items: center; background: #fff; padding: 0 10px; + div { padding: 3px 10px; background: #e9e9e9; border-radius: 10px; margin: 5px 5px; float: left; } + } + &.list { height: auto; + .goods-item { float: left; } + } + &.slide { overflow-x: hidden; white-space: nowrap; width: auto; + .goods-item { float: none; display: inline-block; } + } + .goods-item { + &.column2 { width: 50%; padding: 3px; float: left; } + &.column1 { width: 100%; padding: 8px; height: 140px; display: flex; background: #fff; margin-bottom: 8px; + .goods-price { margin-top: 50px; } + .goods-image { width: 120px; height: 120px; padding: 0; + img { width: 120px; height: 120px; padding: 0; } + } + .goods-detail { flex: 1; } + } + &.column3 { width: 33%; padding: 3px; } + .goods-image { position: relative; width: 100%; height: 0; padding-bottom: 100%; overflow: hidden; background: #fff; + &:after { content: ''; display: block; margin-top: 100%; } + img { position: absolute; width: 100%; height: 100%; top: 0; left: 0; -o-object-fit: cover; object-fit: cover; } + } + .goods-detail { padding: 4px; background: #fff; font-size: 13px; + .goods-name { height: 40px; overflow: hidden; margin-bottom: 5px; } + .goods-price { font-size: 15px; color: red; } + } + } + &.group { background: #fff; padding: 10px; } + .group-item { width: 300px; padding: 10px; position: relative; background: rgb(246, 246, 246); height: 120px; display: inline-block; margin-right: 15px; + .group-image { width: 98px; height: 98px; position: absolute; left: 10px; top: 10px; + img { width: 100%; height: 100%; object-fit: cover; } + } + .group-detail { position: absolute; top: 10px; left: 120px; bottom: 10px; right: 0; + .group-price { position: absolute; top: 50px; left: 0px; font-size: 18px; color: #ff7159; } + .group-time { position: absolute; bottom: 0px; left: 0px; font-size: 12px; + span { color: #ff7159; padding: 3px; text-align: center; + &.time { background: #fff; } + } + } + .buy-icon { position: absolute; bottom: 0; right: 10px; display: block; width: 20px; height: 20px; + img { width: 100%; } + } + } + } +} +.lay-service { width: 50px; height: 50px; padding: 4px; position: absolute; bottom: 30px; right: 10px; } +.lay-record { width: 210px; background: rgba(0,0,0,0.25); position: absolute !important; top: 30%; z-index: 9999; cursor: pointer; + &.left { left: 0; } + &.right { right: 0; } + &:before { cursor: pointer !important; } +} +.record-item { height: 30px; line-height: 30px; padding-left: 10px; + .text { color: #ff7159; } +} +.lay-coupon { padding: 4px 12px; + .coupon-item { width: 100%; box-sizing: border-box; background: linear-gradient(to right, #ff6565, #ff8a8a); margin: .1rem 0; border-radius: 5px; overflow: hidden; position: relative; + .coupon-left { width: 28%; height: 50px; color: rgb(255, 247, 247); font-size: 12px; padding: 0 14px; float: left; margin: 12px 0; text-align: center; box-sizing: border-box; border-right: 1px dotted #fff; display: inline-block; + p { position: relative; top: 50%; transform: translateY(-50%); } + } + .coupon-right { width: 50%; height: 100%; float: left; text-align: left; color: #fff; box-sizing: border-box; padding: 10px; display: inline-block; font-size: 12px; + .conpon-f { font-size: 14px; } + } + .coupon-btn { padding: 0 8px; background-color: #ffe7e7; color: #ff5454; font-size: 12px; position: absolute; top: 50%; transform: translateY(-50%); right: 10px; border-radius: 2px; } + } +} +.lay-imgWindow { min-height: 100px; + &.row0 { + .display { height: 0; width: 100%; margin: 0; padding-bottom: 50%; position: relative; } + } + &.row2 { + .img-wrap { width: 50%; height: 150px; } + } + &.row3 { + .img-wrap { width: 33%; height: 150px; } + } + &.row4 { + .img-wrap { width: 25%; height: 150px; } + } + .img-wrap { float: left; box-sizing: border-box; + img { width: 100%; height: 100%; object-fit: cover; } + } +} +.display { + img { width: 100%; height: 100%; } + .display-left { width: 50%; height: 100%; position: absolute; top: 0; left: 0; } + .display-right { width: 50%; height: 100%; position: absolute; top: 0; left: 50%; + .display-right1 { width: 100%; height: 50%; position: absolute; top: 0; left: 0; } + .display-right2 { width: 100%; height: 50%; position: absolute; top: 50%; left: 0; + .left { width: 50%; height: 100%; position: absolute; top: 0; left: 0; } + .right { width: 50%; height: 100%; position: absolute; top: 0; left: 50%; } + } + } +} +.lay-video { + .video-wrap { width: 100%; z-index: 1200; + video { display: block; width: 100%; } + } +} +.pl25 { padding-left: 25px; } +.custom-tip { margin-top: 40px; + p { margin-bottom: 5px; } +} +#selectGoods { + li { float: left; margin: 10px; height: 70px; width: 70px; background: #f7fafc; position: relative; border-radius: 3px; cursor: move; + img { width: 100%; height: 100%; object-fit: cover; } + .icon-delete { position: absolute; top: -6px; right: -6px; border-radius: 50%; text-align: center; cursor: pointer; font-size: 18px; transition: background-color .3s ease-out, border-color .3s ease-out; -webkit-transition: background-color .3s ease-out, border-color .3s ease-out; + &:hover { color: #000; } + } + } +} +#selectGroupPurchaseGoods { + li { float: left; margin: 10px; height: 100px; width: calc(100% - 20px); background: #f7fafc; position: relative; border-radius: 3px; cursor: move; + .left { float: left; width: 170px; height: 90px; + img { width: 170px; height: 90px; object-fit: cover; } + } + .right { float: left; width: calc(100% - 180px); height: 90px; margin-left: 10px; } + .icon-delete { position: absolute; top: -6px; right: -6px; border-radius: 50%; text-align: center; cursor: pointer; font-size: 18px; transition: background-color .3s ease-out, border-color .3s ease-out; -webkit-transition: background-color .3s ease-out, border-color .3s ease-out; + &:hover { color: #000; } + } + } +} +.divider { height: 0; margin: 20px auto; overflow: hidden; clear: both; border-top: 1px dashed #ccc; } +.el-color-picker { height: 24px !important; vertical-align: middle; } +.el-color-picker__trigger { height: 24px !important; } +.reset-color { display: inline-block; padding: 0 10px; border: 1px solid #bdbdbd; text-align: center; height: 20px; line-height: 20px; vertical-align: middle; margin-left: 5px; } +.main-body { padding: 10px; border: 1px solid #e9e9e9; + .el-form-item { padding: 0px; margin-bottom: 0 !important; font-size: 12px !important; } + .el-form-item__label { font-size: 12px !important; line-height: 40px !important; } + .el-slider__runway { margin: 12px 0 !important; } +} +.custom-item-t { padding: 5px; border-bottom: 1px solid #f0f0f0; margin-bottom: 15px; } +.custom-item-t-c { padding: 0 10px; border-left: 4px solid #ff7159; text-align: left; } +.custom-item { + .layui-form-label { box-sizing: content-box; } + .content { padding: 10px; } + .drag-block { height: 30px; background: #f2f2f2; cursor: move; position: relative; + .handle-icon { position: absolute; right: 0px; top: 0; width: 30px; height: 30px; line-height: 30px; text-align: center; cursor: pointer; + .iconfont { font-size: 16px !important; color: #999; margin: 0 auto; + &:hover { color: #ff7159; } + } + } + } + .content-item { position: relative; display: -webkit-box; display: -ms-flexbox; display: flex; margin-bottom: 5px; + .item-label { width: 90px; } + .el-input { -webkit-box-flex: 1; -ms-flex: 1; flex: 1; } + } + li { border: 1px dashed #e9e9e9; + &.ghost { border-color: #ff7159; } + } + .addImg { width: 100%; height: 32px; line-height: 32px; text-align: left; border: 1px dashed #e9e9e9; margin-top: 15px; cursor: pointer; padding-left: 5px; + .iconfont { font-size: 12px !important; margin-right: 5px !important; } + &:hover { color: #ff7159; } + } +} +.content-item { + .el-form-item { flex: 1; } + .el-radio-group { + .el-radio { margin-bottom: 10px; } + } +} +.el-select-dropdown__item { + &.second { + span { padding-left: 15px !important; } + } +} +.number-input { width: 100%; padding: 5px; margin-bottom: 4px; border: 0; border-bottom: 1px solid #c2cad8; transition: all ease-in-out 0.15s; + &:focus { border-color: #ff7159; } +} +.tpl-block { flex: 1; padding-left: 20px; } +.tpl-item { width: 75px; height: 75px; display: inline-block; border: 1px solid #e5e5e5; margin: 0 10px 15px 0; padding-top: 5px; background-color: #fff; text-align: center; cursor: pointer; + &.active { border: 1px solid #ff7159; } + .tpl-item-image { height: 40px; + img { height: auto; width: 60px; margin: 0 auto; vertical-align: middle; } + } + .tpl-item-text { margin-top: 10px; font-size: 12px; } +} +.selectLinkVal { width: 100%; padding: 0px 10px; color: #555; height: 30px; line-height: 30px; margin-top: 5px; border: 1px solid #bdbdbd; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; font-size: 12px; } +.layout-select { width: 100%; padding: 5px 6px; color: #555; line-height: 1.5; margin-bottom: 4px; } +.el-select { width: 100% !important; } +.el-input__inner, .el-textarea__inner { border-radius: 0 !important; border: 1px solid #bdbdbd !important; height: 30px !important; line-height: 30px !important; padding: 0 10px !important; font-size: 12px !important; } +.ml20 { margin-left: 20px; } +.layout-tip { color: #838fa1; font-size: 12px; } +*, *:before, *:after { box-sizing: inherit; } +.layui-nav { + .layui-nav-item { box-sizing: content-box; } +} + + +.tabBarItem { border: 1px solid #e9e9e9; margin-bottom: 10px; padding: 10px; } diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.min.css b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.min.css new file mode 100644 index 0000000..35f6af3 --- /dev/null +++ b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/css/style.min.css @@ -0,0 +1 @@ +html{line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;box-sizing:border-box;}body{margin:0;padding:20px;}article,aside,footer,header,nav,section{display:block;}h1{font-size:2em;margin:.67em 0;}figcaption,figure,main{display:block;}figure{margin:1em 40px;}hr{box-sizing:content-box;height:0;overflow:visible;}pre{font-family:monospace,monospace;font-size:1em;}a{background-color:transparent;-webkit-text-decoration-skip:objects;}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted;}b,strong{font-weight:inherit;font-weight:bolder;}code,kbd,samp{font-family:monospace,monospace;font-size:1em;}dfn{font-style:italic;}mark{background-color:#ff0;color:#000;}small{font-size:80%;}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;}sub{bottom:-.25em;}sup{top:-.5em;}audio,video{display:inline-block;}audio:not([controls]){display:none;height:0;}img{border-style:none;}svg:not(:root){overflow:hidden;}button,input,optgroup,select,textarea{font-family:sans-serif;font-size:100%;line-height:1.15;margin:0;}button,input{overflow:visible;}button,select{text-transform:none;}button,html [type="button"],[type="reset"],[type="submit"]{-webkit-appearance:button;}button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{border-style:none;padding:0;}button:-moz-focusring,[type="button"]:-moz-focusring,[type="reset"]:-moz-focusring,[type="submit"]:-moz-focusring{outline:1px dotted ButtonText;}fieldset{padding:.35em .75em .625em;}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal;}progress{display:inline-block;vertical-align:baseline;}textarea{overflow:auto;}[type="checkbox"],[type="radio"]{box-sizing:border-box;padding:0;}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto;}[type="search"]{-webkit-appearance:textfield;outline-offset:-2px;}[type="search"]::-webkit-search-cancel-button,[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit;}details,menu{display:block;}summary{display:list-item;}canvas{display:inline-block;}template{display:none;}[hidden]{display:none;}.clearfix:after{content:".";display:block;clear:both;visibility:hidden;height:0;font-size:0;}::-moz-selection{background:#009688;color:#fff;}::selection{background:#159b76;color:#fff;}::-webkit-scrollbar{width:6px;height:6px;}::-webkit-scrollbar-thumb{border-radius:10px;background-color:#bdbdbd;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);}.twolist-hidden{display:-webkit-box;word-break:break-all;text-overflow:ellipsis;overflow:hidden;-webkit-box-orient:vertical;-webkit-line-clamp:2;}.form-edit-wrapper{display:-webkit-box;display:-ms-flexbox;display:flex;width:100%;min-width:1200px;background:#fff;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;}.edit-body{height:auto;width:calc(100% - 700px);}.center-container{width:375px;height:806px;border:1px solid #e9e9e9;box-shadow:0 3px 10px #dcdcdc;position:relative;}.center-container .model-title{height:88px;width:100%;position:relative;}.center-container .model-title img{width:100%;height:100%;}.nav-aside{width:300px;height:auto;position:relative;}.nav-aside .components-wrap{border:1px solid #e9e9e9;padding:10px;text-align:left;color:#666;}.nav-aside .components-wrap .components-title{padding:5px;border-bottom:1px solid #f0f0f0;margin-bottom:35px;}.nav-aside .components-wrap .components-title .text{padding:0 10px;border-left:4px solid #ff7159;}.nav-aside .components-wrap .components-list{display:-webkit-box;display:-ms-flexbox;display:flex;}.nav-aside .components-wrap .components-list .component-item{padding:10px;}.nav-aside .components-wrap .components-list .component-item ul{position:relative;overflow:hidden;padding:0;margin:0;}.nav-aside .components-wrap .components-list .component-item-title{font-size:12px;color:#999;margin:10px 0;}.nav-aside .components-wrap .components-list .component-item-li{width:74px;float:left;padding:3px 0;margin:5px;height:50px;text-align:center;display:block;background-color:#f5f5f5;border:1px solid #ddd;font-size:12px;color:#333;cursor:pointer;-webkit-transition:all .5s;transition:all .5s;height:auto;}.nav-aside .components-wrap .components-list .component-item-li .iconfont{font-size:20px !important;margin-bottom:5px;margin-right:0 !important;}.nav-aside .components-wrap .components-list .component-item-li .text{padding:0;margin-top:5px;}.recycle{position:absolute;top:43px;right:26px;}.recycle ul{position:relative;}.recycle ul li.component-item-li{display:none;}.recycle ul .layout-main{position:absolute;width:100%;height:30px;top:10px;left:0;}.recycle ul .ghost{background:#fff;border:1px dashed #409eff;position:absolute;left:0;line-height:30px;height:30px;overflow:hidden;list-style:none;font-size:0;}.recycle ul .ghost::after{content:'删除组件';display:block;background:#fff;position:absolute;text-align:center;top:0;left:0;right:0;font-size:12px;color:#000;z-index:2000;}.recycle-content{width:55px;padding:3px 0;margin:5px;height:45px;text-align:center;background-color:#fff;border:1px solid #ddd;font-size:12px;color:#333;-webkit-transition:all .5s;transition:all .5s;height:auto;}.recycle-content .iconfont{font-size:16px !important;margin-right:0 !important;margin-bottom:3px;}.recycle-content .text{margin-top:5px;}.layout-list{height:710px;overflow-y:scroll;}.layout-list .layout-main{position:relative;}.layout-list .layout-main.npr{position:static !important;}.layout-list .layout-main .drag{position:relative;}.layout-list .layout-main .lay-item{display:-webkit-box;display:-ms-flexbox;display:flex;}.layout-list .layout-main .lay-notice{line-height:32px;padding:2px 10px;background:#fff;overflow:hidden;}.layout-list .layout-main .lay-notice .notice-right{height:32px;overflow:hidden;}.layout-list .layout-main .lay-notice .notice-right .notice-text{text-overflow:ellipsis;overflow:hidden;white-space:nowrap;}.layout-list .layout-main .lay-notice .iconfont{color:#ff7159;margin-right:2px;}.layout-list .layout-main .lay-guide .line{width:100%;height:0;border-top:1px solid #000;}.layout-list .layout-main .lay-textarea textarea{display:block;width:100%;border:none;}.layout-list .layout-main .lay-navBar.row3 .item{width:33.3333%;}.layout-list .layout-main .lay-navBar.row4 .item{width:25%;}.layout-list .layout-main .lay-navBar.row5 .item{width:20%;}.layout-list .layout-main .lay-navBar .item{float:left;text-align:center;padding:10px 0;}.layout-list .layout-main .lay-navBar .item-image{margin-bottom:4px;text-align:center;}.layout-list .layout-main .lay-navBar .item-image img{height:44px;width:44px;object-fit:cover;}.layout-list .layout-main .lay-navBar .item-text{height:20px;line-height:20px;width:70px;margin:0 auto;text-align:center;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;}.layout-list .layout-main .lay-imgSingle .img-wrap{display:block;margin:0;height:auto;flex:1;position:relative;}.layout-list .layout-main .lay-imgSingle .img-wrap img{display:block;width:100%;}.layout-list .layout-main .lay-imgSingle .img-wrap .img-btn{display:block;position:absolute;bottom:25px;left:40px;width:80px;height:30px;line-height:30px;text-align:center;}.layout-list .layout-main .lay-imgSlide .el-carousel{overflow:hidden !important;width:100%;height:175px !important;}.layout-list .layout-main .el-carousel__container{height:175px !important;}.layout-list .layout-main .el-carousel__item{height:175px !important;}.layout-list .layout-main .lay-search{width:100%;height:50px;padding:7px 13px;}.layout-list .layout-main .lay-search .iconfont{position:absolute;top:50%;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%);right:15px;color:#999;font-size:18px !important;}.layout-list .layout-main .lay-search-c{width:100%;height:100%;position:relative;}.layout-list .layout-main .lay-search-input{width:100%;height:100%;border-radius:50px;background-color:#e9e9e9;border:none;padding:0 15px;color:#999;cursor:move;}.layout-list .layout-main .lay-search-input.square{border-radius:0;}.layout-list .layout-main .lay-search-input.radius{border-radius:5px;}.layout-list .layout-main .lay-search-input.round{border-radius:18px;}.layout-list .layout-main .btn-clone{position:absolute;height:18px;line-height:18px;right:50px;bottom:2px;z-index:90;width:36px;text-align:center;font-size:10px;color:#fff;background:#409eff;cursor:pointer;z-index:1300;}.layout-list .layout-main .btn-delete{position:absolute;height:18px;line-height:18px;right:2px;bottom:2px;z-index:90;width:36px;text-align:center;font-size:10px;color:#fff;background:rgba(0,0,0,.4);cursor:pointer;z-index:1300;}.layout-list .ghost{background:#fff;border:1px dashed #409eff;}.layout-list .ghost::after{background:#fff;}.layout-list li.ghost{position:relative;line-height:30px;list-style:none;font-size:0;}.layout-list li.ghost::after{content:'放到这里';display:block;background:#fff;position:absolute;left:50%;margin-left:-32px;top:0;font-size:16px;color:#999;z-index:10;}.layout-list .layout-main.active .drag:before,.layout-main:hover .drag:before{content:'';position:absolute;top:0;left:0;right:0;bottom:0;border:2px dashed #ff7159;cursor:move;z-index:1001;}.lay-navBar{min-height:88px;}.lay-article{background:#f7f7f7;}.lay-article .article-wrap{width:100%;height:100px;padding:15px;background:#fff;}.lay-article .article-wrap:not(last-child){margin-bottom:10px;}.lay-article .article-wrap .article-left{float:left;height:100%;width:200px;}.lay-article .article-wrap .article-img{float:right;width:120px;height:70px;}.lay-article .article-wrap .article-img img{display:block;width:120px;height:100%;object-fit:cover;}.savePageBtn{padding:10px 13px;text-align:right;border-top:1px dotted #ddd;}.lay-special{height:30px;align-items:center;}.lay-special .special-left{width:70px;padding:5px 10px;}.lay-special .special-left img{width:100%;}.lay-goods{background:#f6f6f6;}.lay-goods .goods-head{height:40px;display:flex;justify-content:space-between;align-items:center;background:#fff;padding:0 10px;}.lay-goods .goods-tab-head{min-height:40px;display:inline-block;justify-content:flex-start;align-items:center;background:#fff;padding:0 10px;}.lay-goods .goods-tab-head div{padding:3px 10px;background:#e9e9e9;border-radius:10px;margin:5px 5px;float:left;}.lay-goods.list{height:auto;}.lay-goods.list .goods-item{float:left;}.lay-goods.slide{overflow-x:hidden;white-space:nowrap;width:auto;}.lay-goods.slide .goods-item{float:none;display:inline-block;}.lay-goods .goods-item.column2{width:50%;padding:3px;float:left;}.lay-goods .goods-item.column1{width:100%;padding:8px;height:140px;display:flex;background:#fff;margin-bottom:8px;}.lay-goods .goods-item.column1 .goods-price{margin-top:50px;}.lay-goods .goods-item.column1 .goods-image{width:120px;height:120px;padding:0;}.lay-goods .goods-item.column1 .goods-image img{width:120px;height:120px;padding:0;}.lay-goods .goods-item.column1 .goods-detail{flex:1;}.lay-goods .goods-item.column3{width:33%;padding:3px;}.lay-goods .goods-item .goods-image{position:relative;width:100%;height:0;padding-bottom:100%;overflow:hidden;background:#fff;}.lay-goods .goods-item .goods-image:after{content:'';display:block;margin-top:100%;}.lay-goods .goods-item .goods-image img{position:absolute;width:100%;height:100%;top:0;left:0;-o-object-fit:cover;object-fit:cover;}.lay-goods .goods-item .goods-detail{padding:4px;background:#fff;font-size:13px;}.lay-goods .goods-item .goods-detail .goods-name{height:40px;overflow:hidden;margin-bottom:5px;}.lay-goods .goods-item .goods-detail .goods-price{font-size:15px;color:#f00;}.lay-goods.group{background:#fff;padding:10px;}.lay-goods .group-item{width:300px;padding:10px;position:relative;background:#f6f6f6;height:120px;display:inline-block;margin-right:15px;}.lay-goods .group-item .group-image{width:98px;height:98px;position:absolute;left:10px;top:10px;}.lay-goods .group-item .group-image img{width:100%;height:100%;object-fit:cover;}.lay-goods .group-item .group-detail{position:absolute;top:10px;left:120px;bottom:10px;right:0;}.lay-goods .group-item .group-detail .group-price{position:absolute;top:50px;left:0;font-size:18px;color:#ff7159;}.lay-goods .group-item .group-detail .group-time{position:absolute;bottom:0;left:0;font-size:12px;}.lay-goods .group-item .group-detail .group-time span{color:#ff7159;padding:3px;text-align:center;}.lay-goods .group-item .group-detail .group-time span.time{background:#fff;}.lay-goods .group-item .group-detail .buy-icon{position:absolute;bottom:0;right:10px;display:block;width:20px;height:20px;}.lay-goods .group-item .group-detail .buy-icon img{width:100%;}.lay-service{width:50px;height:50px;padding:4px;position:absolute;bottom:30px;right:10px;}.lay-record{width:210px;background:rgba(0,0,0,.25);position:absolute !important;top:30%;z-index:9999;cursor:pointer;}.lay-record.left{left:0;}.lay-record.right{right:0;}.lay-record:before{cursor:pointer !important;}.record-item{height:30px;line-height:30px;padding-left:10px;}.record-item .text{color:#ff7159;}.lay-coupon{padding:4px 12px;}.lay-coupon .coupon-item{width:100%;box-sizing:border-box;background:linear-gradient(to right,#ff6565,#ff8a8a);margin:.1rem 0;border-radius:5px;overflow:hidden;position:relative;}.lay-coupon .coupon-item .coupon-left{width:28%;height:50px;color:#fff7f7;font-size:12px;padding:0 14px;float:left;margin:12px 0;text-align:center;box-sizing:border-box;border-right:1px dotted #fff;display:inline-block;}.lay-coupon .coupon-item .coupon-left p{position:relative;top:50%;transform:translateY(-50%);}.lay-coupon .coupon-item .coupon-right{width:50%;height:100%;float:left;text-align:left;color:#fff;box-sizing:border-box;padding:10px;display:inline-block;font-size:12px;}.lay-coupon .coupon-item .coupon-right .conpon-f{font-size:14px;}.lay-coupon .coupon-item .coupon-btn{padding:0 8px;background-color:#ffe7e7;color:#ff5454;font-size:12px;position:absolute;top:50%;transform:translateY(-50%);right:10px;border-radius:2px;}.lay-imgWindow{min-height:100px;}.lay-imgWindow.row0 .display{height:0;width:100%;margin:0;padding-bottom:50%;position:relative;}.lay-imgWindow.row2 .img-wrap{width:50%;height:150px;}.lay-imgWindow.row3 .img-wrap{width:33%;height:150px;}.lay-imgWindow.row4 .img-wrap{width:25%;height:150px;}.lay-imgWindow .img-wrap{float:left;box-sizing:border-box;}.lay-imgWindow .img-wrap img{width:100%;height:100%;object-fit:cover;}.display img{width:100%;height:100%;}.display .display-left{width:50%;height:100%;position:absolute;top:0;left:0;}.display .display-right{width:50%;height:100%;position:absolute;top:0;left:50%;}.display .display-right .display-right1{width:100%;height:50%;position:absolute;top:0;left:0;}.display .display-right .display-right2{width:100%;height:50%;position:absolute;top:50%;left:0;}.display .display-right .display-right2 .left{width:50%;height:100%;position:absolute;top:0;left:0;}.display .display-right .display-right2 .right{width:50%;height:100%;position:absolute;top:0;left:50%;}.lay-video .video-wrap{width:100%;z-index:1200;}.lay-video .video-wrap video{display:block;width:100%;}.pl25{padding-left:25px;}.custom-tip{margin-top:40px;}.custom-tip p{margin-bottom:5px;}#selectGoods li{float:left;margin:10px;height:70px;width:70px;background:#f7fafc;position:relative;border-radius:3px;cursor:move;}#selectGoods li img{width:100%;height:100%;object-fit:cover;}#selectGoods li .icon-delete{position:absolute;top:-6px;right:-6px;border-radius:50%;text-align:center;cursor:pointer;font-size:18px;transition:background-color .3s ease-out,border-color .3s ease-out;-webkit-transition:background-color .3s ease-out,border-color .3s ease-out;}#selectGoods li .icon-delete:hover{color:#000;}#selectGroupPurchaseGoods li{float:left;margin:10px;height:100px;width:calc(100% - 20px);background:#f7fafc;position:relative;border-radius:3px;cursor:move;}#selectGroupPurchaseGoods li .left{float:left;width:170px;height:90px;}#selectGroupPurchaseGoods li .left img{width:170px;height:90px;object-fit:cover;}#selectGroupPurchaseGoods li .right{float:left;width:calc(100% - 180px);height:90px;margin-left:10px;}#selectGroupPurchaseGoods li .icon-delete{position:absolute;top:-6px;right:-6px;border-radius:50%;text-align:center;cursor:pointer;font-size:18px;transition:background-color .3s ease-out,border-color .3s ease-out;-webkit-transition:background-color .3s ease-out,border-color .3s ease-out;}#selectGroupPurchaseGoods li .icon-delete:hover{color:#000;}.divider{height:0;margin:20px auto;overflow:hidden;clear:both;border-top:1px dashed #ccc;}.el-color-picker{height:24px !important;vertical-align:middle;}.el-color-picker__trigger{height:24px !important;}.reset-color{display:inline-block;padding:0 10px;border:1px solid #bdbdbd;text-align:center;height:20px;line-height:20px;vertical-align:middle;margin-left:5px;}.main-body{padding:10px;border:1px solid #e9e9e9;}.main-body .el-form-item{padding:0;margin-bottom:0 !important;font-size:12px !important;}.main-body .el-form-item__label{font-size:12px !important;line-height:40px !important;}.main-body .el-slider__runway{margin:12px 0 !important;}.custom-item-t{padding:5px;border-bottom:1px solid #f0f0f0;margin-bottom:15px;}.custom-item-t-c{padding:0 10px;border-left:4px solid #ff7159;text-align:left;}.custom-item .layui-form-label{box-sizing:content-box;}.custom-item .content{padding:10px;}.custom-item .drag-block{height:30px;background:#f2f2f2;cursor:move;position:relative;}.custom-item .drag-block .handle-icon{position:absolute;right:0;top:0;width:30px;height:30px;line-height:30px;text-align:center;cursor:pointer;}.custom-item .drag-block .handle-icon .iconfont{font-size:16px !important;color:#999;margin:0 auto;}.custom-item .drag-block .handle-icon .iconfont:hover{color:#ff7159;}.custom-item .content-item{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;margin-bottom:5px;}.custom-item .content-item .item-label{width:90px;}.custom-item .content-item .el-input{-webkit-box-flex:1;-ms-flex:1;flex:1;}.custom-item li{border:1px dashed #e9e9e9;}.custom-item li.ghost{border-color:#ff7159;}.custom-item .addImg{width:100%;height:32px;line-height:32px;text-align:left;border:1px dashed #e9e9e9;margin-top:15px;cursor:pointer;padding-left:5px;}.custom-item .addImg .iconfont{font-size:12px !important;margin-right:5px !important;}.custom-item .addImg:hover{color:#ff7159;}.content-item .el-form-item{flex:1;}.content-item .el-radio-group .el-radio{margin-bottom:10px;}.el-select-dropdown__item.second span{padding-left:15px !important;}.number-input{width:100%;padding:5px;margin-bottom:4px;border:0;border-bottom:1px solid #c2cad8;transition:all ease-in-out .15s;}.number-input:focus{border-color:#ff7159;}.tpl-block{flex:1;padding-left:20px;}.tpl-item{width:75px;height:75px;display:inline-block;border:1px solid #e5e5e5;margin:0 10px 15px 0;padding-top:5px;background-color:#fff;text-align:center;cursor:pointer;}.tpl-item.active{border:1px solid #ff7159;}.tpl-item .tpl-item-image{height:40px;}.tpl-item .tpl-item-image img{height:auto;width:60px;margin:0 auto;vertical-align:middle;}.tpl-item .tpl-item-text{margin-top:10px;font-size:12px;}.selectLinkVal{width:100%;padding:0 10px;color:#555;height:30px;line-height:30px;margin-top:5px;border:1px solid #bdbdbd;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;font-size:12px;}.layout-select{width:100%;padding:5px 6px;color:#555;line-height:1.5;margin-bottom:4px;}.el-select{width:100% !important;}.el-input__inner,.el-textarea__inner{border-radius:0 !important;border:1px solid #bdbdbd !important;height:30px !important;line-height:30px !important;padding:0 10px !important;font-size:12px !important;}.ml20{margin-left:20px;}.layout-tip{color:#838fa1;font-size:12px;}*,*:before,*:after{box-sizing:inherit;}.layui-nav .layui-nav-item{box-sizing:content-box;}.tabBarItem{border:1px solid #e9e9e9;margin-bottom:10px;padding:10px;} \ No newline at end of file diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/js/main.js b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/js/main.js index 3d91237..97d1b7c 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/lib/custom/js/main.js +++ b/CoreCms.Net.Web.Admin/wwwroot/lib/custom/js/main.js @@ -216,6 +216,82 @@ var allWidget = { ] }, }, + { + "type": "goodTabBar", + "name": "商品选项卡", + "icon": "icon-shangpin", + "value": { + "isFixedHead": "true",//是否固定头部 + "list": [ + { + "title": '选项卡名称一', + "subTitle": '子标题一', + "type": "auto", //auto自动获取 choose 手动选择 + "classifyId": '', //所选分类id + "brandId": '', //所选品牌id + "limit": 10, + "column": 2, //分裂数量 + "isShow":true, + "list": [ + { + "image": "/static/images/common/empty-banner.png", + "name": '', + "price": '' + }, + { + "image": "/static/images/common/empty-banner.png", + "name": '', + "price": '' + }, + { + "image": "/static/images/common/empty-banner.png", + "name": '', + "price": '' + }, + { + "image": "/static/images/common/empty-banner.png", + "name": '', + "price": '' + } + ], + "hasChooseGoods": [], + }, + { + "title": '选项卡名称二', + "subTitle": '子标题二', + "type": "auto", //auto自动获取 choose 手动选择 + "classifyId": '', //所选分类id + "brandId": '', //所选品牌id + "limit": 10, + "column": 2, //分裂数量 + "isShow": true, + "list": [ + { + "image": "/static/images/common/empty-banner.png", + "name": '', + "price": '' + }, + { + "image": "/static/images/common/empty-banner.png", + "name": '', + "price": '' + }, + { + "image": "/static/images/common/empty-banner.png", + "name": '', + "price": '' + }, + { + "image": "/static/images/common/empty-banner.png", + "name": '', + "price": '' + } + ], + "hasChooseGoods": [], + } + ] + }, + }, { "type": "groupPurchase", "name": "团购秒杀", @@ -742,6 +818,9 @@ Vue.component('layout-config', { case 'goods': return '商品组' break; + case 'goodTabBar': + return '商品选项卡' + break; case 'groupPurchase': return '团购秒杀' break; @@ -1049,6 +1128,66 @@ Vue.component('layout-config', { handleDeleteGoods: function (index) { this.selectWg.value.list.splice(index, 1) }, + + //切换TabBar商品来源类型 + changeTabBarGoodsType: function (val, key) { + console.log(val); + console.log(key); + if (val == 'auto') { + this.selectWg.value.list[key].hasChooseGoods = this.selectWg.value.list[key].list; + this.selectWg.value.list[key].list = this.defaultGoods + } else { + this.selectWg.value.list[key].list = this.selectWg.value.list[key].hasChooseGoods.length > 0 ? this.selectWg.value.list[key].hasChooseGoods : this.defaultGoods + } + }, + handleDeleteTabBarGoods: function (key, index) { + console.log(key); + console.log(index); + this.selectWg.value.list[key].list.splice(index, 1) + }, + handleRemoveTabBar: function (index) { + this.selectWg.value.list.splice(index, 1) + }, + handleChange: function (index) { + console.log(index); + }, + handleAddTabBarGoods: function () { + this.selectWg.value.list.push({ + "title": '选项卡名称', + "subTitle": '子标题', + "type": "auto", //auto自动获取 choose 手动选择 + "classifyId": '', //所选分类id + "brandId": '', //所选品牌id + "limit": 10, + "column": 2, //分裂数量 + "isShow": false, + "list": [ + { + "image": "/static/images/common/empty-banner.png", + "name": '', + "price": '' + }, + { + "image": "/static/images/common/empty-banner.png", + "name": '', + "price": '' + }, + { + "image": "/static/images/common/empty-banner.png", + "name": '', + "price": '' + }, + { + "image": "/static/images/common/empty-banner.png", + "name": '', + "price": '' + } + ], + "hasChooseGoods": [], + }) + }, + + selectNotice: function () { var that = this; layui.use(['form', 'table'], function () { @@ -1173,20 +1312,13 @@ Vue.component('layout-config', { }, selectGoods: function () { var that = this; - var objData = {}; - var list = that.selectWg.value.list; - for (var i = 0; i < list.length; i++) { - if (list[i].id) { - objData[list[i].id] = list[i]; - } - } layui.use(['form', 'table'], function () { layui.admin.popup({ title: '商品列表', area: ['1200px', '90%'], id: 'LAY-app-CoreCmsCommon-getGoodIds', success: function (layero, index) { - layui.view(this.id).render('common/getGoodIds', { data: objData }).done(function () { + layui.view(this.id).render('common/getGoodIds', null).done(function () { layui.form.on('submit(LAY-app-CoreCmsGoods-getData)', function (data) { //判断个数是否满足 @@ -1204,6 +1336,37 @@ Vue.component('layout-config', { layer.close(index); }); + }); + } + }); + }); + }, + selectTabBarGoods: function (key) { + var that = this; + layui.use(['form', 'table'], function () { + layui.admin.popup({ + title: '商品列表', + area: ['1200px', '90%'], + id: 'LAY-app-CoreCmsCommon-getGoodIds', + success: function (layero, index) { + layui.view(this.id).render('common/getGoodIds', null).done(function () { + layui.form.on('submit(LAY-app-CoreCmsGoods-getData)', + function (data) { + //判断个数是否满足 + if (Object.getOwnPropertyNames(ids).length > that.maxSelectGoods) { + layer.msg("最多只能选择" + that.maxSelectGoods + "个"); + return false; + } + var arr = [] + for (let i in ids) { + arr.push(ids[i]); + } + //that.hasChooseGoods = arr; + that.$set(that.selectWg.value.list[key], 'list', arr) + console.log(arr); + layer.close(index); + }); + }); } }); diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/design.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/design.html index 052d22f..87a39b1 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/design.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/pages/design.html @@ -37,6 +37,7 @@
1.设计完成后点击"保存页面"，在前端端页面下拉刷新即可看到效果。2.自定义页面的地址为：/pages/index/custom?pageCode=themes，其中themes为新增页面时的编码 + 因前后端视觉差异问题，请保存后，前端预览效果，后端设计器仅供大体格局展示。
@@ -173,6 +174,25 @@
+ +
+
+
{{goods.title}}
+
+
+
+
+ +
+
+

+ {{goodsitem.name||'此处显示商品名称'}} +

+

{{goodsitem.price||'99.00'}}

+
+
+
+
@@ -528,7 +548,99 @@

- 商品数据请到 商品管理 - 商品列表 中管理 + 商品数据请到 商品管理 - 商品列表 中管理 +

+
+
+ + + diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html index 59065af..0e659f5 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html @@ -93,9 +93,9 @@
- +
- +
如：湘ICP备15004965号-2
diff --git a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs index 6f2bcdd..ccc3eae 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs @@ -94,7 +94,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers var shopLogo = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShopLogo); //店铺logo var shopName = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShopName); //店铺名称 - var shopBeian = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShopBeian); //店铺备案 + var shopBeiAn = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShopBeiAn); //店铺备案 var shopDesc = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShopDesc); //店铺描述 var showStoresSwitch = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowStoresSwitch).ObjectToInt(2); //显示门店列表 var showStoreBalanceRechargeSwitch = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowStoreBalanceRechargeSwitch).ObjectToInt(2); //显示充值功能 @@ -157,7 +157,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers { shopLogo, shopName, - shopBeian, + shopBeiAn = shopBeiAn, shopDesc, imageMax, storeSwitch, -- Gitee