+
{{/case}}
{{case goods}}
{{switch vss.config.view_list_show_style}}
{{case rolling}}
-
+
{{foreach $vss.config.data_list as $g}}
@@ -84,7 +84,7 @@
{{/case}}
{{default /}}
-
+
{{foreach $vss.config.data_list as $g}}
-
@@ -127,8 +127,6 @@
{{/case}}
{{/switch}}
- {{else /}}
- {{$vss.name}}
{{/if}}
diff --git a/application/service/LayoutService.php b/application/service/LayoutService.php
index e0b7c14ddf7e5d024004d2a20b45d395524a6dc4..2d1158f3303ac635397f5ad83cf255b498cb0469 100644
--- a/application/service/LayoutService.php
+++ b/application/service/LayoutService.php
@@ -67,15 +67,11 @@ class LayoutService
*/
public static function LayoutConfigAdminData($key)
{
- // key 值是否存在
- if(!array_key_exists($key, self::$layout_key))
+ if(array_key_exists($key, self::$layout_key))
{
- return DataReturn('布局key值有', -1);
+ return BaseLayout::ConfigAdminHandle(MyC(self::$layout_key[$key]));
}
-
- // 配置数据
- $config = BaseLayout::ConfigAdminHandle(MyC(self::$layout_key[$key]));
- return DataReturn('success', 0, $config);
+ return '';
}
/**
@@ -89,15 +85,11 @@ class LayoutService
*/
public static function LayoutConfigData($key)
{
- // key 值是否存在
- if(!array_key_exists($key, self::$layout_key))
+ if(array_key_exists($key, self::$layout_key))
{
- return DataReturn('布局key值有', -1);
+ return BaseLayout::ConfigHandle(MyC(self::$layout_key[$key]));
}
-
- // 配置数据
- $config = BaseLayout::ConfigHandle(MyC(self::$layout_key[$key]));
- return DataReturn('success', 0, $config);
+ return '';
}
}
?>
\ No newline at end of file
diff --git a/public/static/common/css/layout.admin.css b/public/static/common/css/layout.admin.css
index dc185348e27f4e7a61f54b6cc077e36b1bee2e0f..97d2553084ac3f33c92ef5df356a500a2f7e0d13 100644
--- a/public/static/common/css/layout.admin.css
+++ b/public/static/common/css/layout.admin.css
@@ -82,9 +82,6 @@
/**
* 布局容器-内容
*/
-.layout-view {
- background: #fff;
-}
.layout-view .drag-submit {
background: #e6e6e6;
cursor: move !important;
diff --git a/public/static/common/css/layout.css b/public/static/common/css/layout.css
index 55c0f30b67b5a7fc301557c0ef7e9ac7c98c763c..b4b6313e80cbe86cde4f8421ebde298283d12bcd 100644
--- a/public/static/common/css/layout.css
+++ b/public/static/common/css/layout.css
@@ -12,11 +12,6 @@
* 模块类型样式 - 数据列表
*/
.module-list-content li{float:left}
-.module-list-content .module-item{background:#fff}
-.module-list-content .module-item .item-bottom{margin-top:5px}
-.module-list-content .module-item .module-title{margin-bottom:5px}
-.module-list-content .module-item .module-title{max-width:100%;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;line-height:18px;height:34px;white-space:initial !important}
-.module-list-content .module-item .module-price{color:#c00;font-weight:bold;word-wrap:normal;text-overflow:ellipsis;white-space:nowrap}
.module-list-content-avg-1{width:calc(100% + 1px);margin-left:-1px;margin-top:-1px;}
.module-list-content-avg-2{width:calc(100% + 2px);margin-left:-2px;margin-top:-2px;}
.module-list-content-avg-3{width:calc(100% + 3px);margin-left:-3px;margin-top:-3px;}
@@ -90,6 +85,15 @@
.module-list-sm-12 li{width:8.33%;}
}
+/**
+ * 商品列表
+ */
+.module-goods-content .module-item{background:#fff}
+.module-goods-content .module-item .item-bottom{margin-top:5px}
+.module-goods-content .module-item .module-title{margin-bottom:5px}
+.module-goods-content .module-item .module-title{max-width:100%;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;line-height:18px;height:34px;white-space:initial !important}
+.module-goods-content .module-item .module-price{color:#c00;font-weight:bold;word-wrap:normal;text-overflow:ellipsis;white-space:nowrap}
+
/**
* 布局圆角
@@ -1890,12 +1894,6 @@
.module-list-content li .module-item .module-title,
.module-list-content li .module-item .module-price {overflow: hidden;}
-/**
- * 模块类型样式 - 图片
- */
-.module-content-type-images{text-align:center}
-.module-content-type-images a{display:block}
-
/**
* 模块类型样式 - 标题
*/
@@ -1914,6 +1912,7 @@
*/
.layout-content img,
.layout-content video{display:block;max-width:100%;max-height:100%}
+.layout-content .am-slider-default{background-color:transparent;}
/**
* 不展示滚动导航点
diff --git a/public/static/common/js/layout.admin.js b/public/static/common/js/layout.admin.js
index 1b4e5d666ffdfd80cbac220e08971dd9d2e2580f..f40c1e8edfa29345376491fb2978e2b24e162189 100644
--- a/public/static/common/js/layout.admin.js
+++ b/public/static/common/js/layout.admin.js
@@ -892,7 +892,7 @@ function FormBackModuleConfigGoodsHandle(data)
nav_dot_ent = show_style_value.is_nav_dot ? '' : 'slides-rolling-not-dot';
// html拼接
- html += '
';
+ html += '
';
html += '
';
html += item_html;
html += '
';
@@ -915,7 +915,7 @@ function FormBackModuleConfigGoodsHandle(data)
// 列表class
list_ent = avg+' module-list-sm-'+sm+' module-list-md-'+md+' module-list-lg-'+md+' ';
- html += '
';
+ html += '';
html += item_html;
html += '
';
break;