diff --git a/application/index/view/default/index/index.html b/application/index/view/default/index/index.html index 6a4f23bb1..d289f2548 100755 --- a/application/index/view/default/index/index.html +++ b/application/index/view/default/index/index.html @@ -18,7 +18,7 @@ {{if !isset($floor_data_type) or $floor_data_type neq 2}} - + {{include file="public/home_banner" /}} diff --git a/application/layout/service/BaseLayout.php b/application/layout/service/BaseLayout.php index ff32f76ec..21ff19ce0 100644 --- a/application/layout/service/BaseLayout.php +++ b/application/layout/service/BaseLayout.php @@ -382,7 +382,7 @@ class BaseLayout public static function LayoutUrlValueHandle($type, $value) { // 当前客户端类型 - $client_type = ApplicationClientType(); + $client_type = APPLICATION_CLIENT_TYPE; // url地址、默认空字符串 $url = ''; diff --git a/public/static/common/css/layout.admin.css b/public/static/common/css/layout.admin.css index 34c5db16d..3349f3879 100644 --- a/public/static/common/css/layout.admin.css +++ b/public/static/common/css/layout.admin.css @@ -593,4 +593,16 @@ bottom: 25px; width: calc(100% - 50px); background: #f8f8f8; +} + +/** + * 布局保存 + */ +.layout-operate-container .am-btn { + padding: 4px 10px; +} +@media only screen and (max-width: 1025px) { + .layout-operate-container { + margin-right: 10px; + } } \ No newline at end of file diff --git a/public/static/common/css/layout.css b/public/static/common/css/layout.css index a652b093d..55c0f30b6 100644 --- a/public/static/common/css/layout.css +++ b/public/static/common/css/layout.css @@ -1,3 +1,8 @@ +/** + * 公共 + */ +.layout-container [class*="am-u-"] {padding-left:0;padding-right:0;} + /** * 布局基础 */ diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js index 6778cf213..8f43d89c7 100755 --- a/public/static/common/js/common.js +++ b/public/static/common/js/common.js @@ -129,7 +129,7 @@ function GetFormVal(element, is_json) }); object = ArrayTurnJson(tmp_all, object); - // input 复选框checkboox + // input 复选框checkbox tmp_all = []; i = 0; $(element).find('input[type="checkbox"]').each(function(key, tmp) @@ -138,6 +138,7 @@ function GetFormVal(element, is_json) { if($(this).is(':checked')) { + console.log(tmp); if(tmp_all[tmp.name] == undefined) { tmp_all[tmp.name] = []; @@ -145,6 +146,12 @@ function GetFormVal(element, is_json) } tmp_all[tmp.name][i] = tmp.value; i++; + } else { + // 滑动开关、未选中则0 + if(typeof($(this).attr('data-am-switch')) != 'undefined') + { + tmp_all[tmp.name] = 0; + } } } }); diff --git a/public/static/index/default/css/index.css b/public/static/index/default/css/index.css index baec55eff..bf95204ac 100755 --- a/public/static/index/default/css/index.css +++ b/public/static/index/default/css/index.css @@ -183,16 +183,4 @@ text-align: center;float:none} .floor .goods-list .goods-items { width: 50%; float: left; padding: 10px; border-bottom: 1px solid #eee; } .floor .goods-list .goods-items:nth-of-type(2n + 1) { border-right: 1px solid #eee; } .floor .goods-list .goods-items:nth-of-type(2n) { border-left: 1px solid transparent; } -} - -/** - * 布局保存 - */ -.layout-operate-container .am-btn { - padding: 4px 10px; -} -@media only screen and (max-width: 1025px) { - .layout-operate-container { - margin-right: 10px; - } } \ No newline at end of file