diff --git a/application/index/view/default/lib/gender.html b/application/index/view/default/lib/gender.html index edac039ae8534ae2dcbb1a9378edcb210e69afee..d3c1ac4b77267348d005a9d34efe4c592e95ec10 100755 --- a/application/index/view/default/lib/gender.html +++ b/application/index/view/default/lib/gender.html @@ -2,7 +2,7 @@
- {{foreach $common_gender_list as $v}} + {{foreach :lang('common_gender_list') as $v}} diff --git a/application/index/view/default/lib/is_new_window_open.html b/application/index/view/default/lib/is_new_window_open.html index ed1ffded39e9b1b72f73fcbe59064eadc9c4ec01..0794abfeb11d7d210b8ba4a32eb838d141c862e6 100755 --- a/application/index/view/default/lib/is_new_window_open.html +++ b/application/index/view/default/lib/is_new_window_open.html @@ -1,12 +1,12 @@
- -
- - - -
+ +
+ {{foreach :lang('common_is_text_list') as $v}} + + {{/foreach}} +
\ No newline at end of file diff --git a/application/index/view/default/lib/is_show.html b/application/index/view/default/lib/is_show.html index 2dc4345381070122519bb04626de9e140023d6b1..797a7448786103946a08feee671a39a23fc22a94 100755 --- a/application/index/view/default/lib/is_show.html +++ b/application/index/view/default/lib/is_show.html @@ -1,12 +1,12 @@
- -
- - - -
+ +
+ {{foreach :lang('common_is_show_list') as $v}} + + {{/foreach}} +
\ No newline at end of file diff --git a/application/service/NavigationService.php b/application/service/NavigationService.php index 518e53b5ea9325f602bd7d0dd87bbce0773bf354..82d28e31a5ee5f48b016570d3b1dddfd6769a8d3 100755 --- a/application/service/NavigationService.php +++ b/application/service/NavigationService.php @@ -333,19 +333,19 @@ class NavigationService 'key_name' => 'is_new_window_open', 'checked_data' => [0,1], 'error_msg' => '是否新窗口打开范围值有误', - ] + ], + [ + 'checked_type' => 'in', + 'key_name' => 'nav_type', + 'checked_data' => ['header', 'footer'], + 'error_msg' => '数据类型有误', + ], ]; switch($params['data_type']) { // 自定义导航 case 'custom': $p = [ - [ - 'checked_type' => 'in', - 'key_name' => 'nav_type', - 'checked_data' => ['header', 'footer'], - 'error_msg' => '数据类型有误', - ], [ 'checked_type' => 'length', 'key_name' => 'name', diff --git a/public/static/admin/default/css/common.css b/public/static/admin/default/css/common.css index 574f75989c601823d0678ef81cdb547582a77030..6707a66808157e5fed29a048222f5a9ae4950447 100755 --- a/public/static/admin/default/css/common.css +++ b/public/static/admin/default/css/common.css @@ -444,17 +444,19 @@ ul {margin-top:0;} .table-nav li a { border-top-left-radius: 2px; border-top-right-radius: 2px; } /** - * PC + * 公共 */ +.am-container {padding-left:0px;padding-right:0px ;} @media only screen and (min-width: 641px) { - /* 树 */ - .submit { display: none; } - #tree tr:hover .submit { display: block !important; } + .submit { display: none; } + #tree tr:hover .submit { display: block !important; } +} +@media only screen and (min-width: 1025px) { + .am-container { max-width: 1000px;} +} +@media only screen and (min-width: 1260px) { + .am-container {max-width: 1200px;} } - -/** - * 手机 - */ @media only screen and (max-width: 641px) { }