diff --git a/application/lang/zh-cn.php b/application/lang/zh-cn.php index 18a36bab2..5b429fdb0 100755 --- a/application/lang/zh-cn.php +++ b/application/lang/zh-cn.php @@ -341,9 +341,9 @@ return array( // 站点类型 'common_site_type_list' => array( - 0 => array('value' => 0, 'name' => '销售型'), - 1 => array('value' => 1, 'name' => '展示型'), - 2 => array('value' => 2, 'name' => '自提点'), + 0 => array('value' => 0, 'name' => '销售'), + 1 => array('value' => 1, 'name' => '展示'), + 2 => array('value' => 2, 'name' => '自提'), 3 => array('value' => 3, 'name' => '虚拟销售'), 4 => array('value' => 4, 'name' => '销售+自提'), ), diff --git a/application/tags.php b/application/tags.php index f10546355..f5b8be0db 100755 --- a/application/tags.php +++ b/application/tags.php @@ -39,14 +39,12 @@ return array ( 2 => 'app\\plugins\\coupon\\Hook', 3 => 'app\\plugins\\distribution\\Hook', 4 => 'app\\plugins\\limitedtimediscount\\Hook', - 5 => 'app\\plugins\\multilingual\\Hook', ), 'plugins_js' => array ( 0 => 'app\\plugins\\share\\Hook', 1 => 'app\\plugins\\coupon\\Hook', 2 => 'app\\plugins\\limitedtimediscount\\Hook', - 3 => 'app\\plugins\\multilingual\\Hook', ), 'plugins_view_common_bottom' => array ( @@ -188,9 +186,5 @@ return array ( array ( 0 => 'app\\plugins\\limitedtimediscount\\Hook', ), - 'plugins_view_header_navigation_top_left' => - array ( - 0 => 'app\\plugins\\multilingual\\Hook', - ), ); ?> \ No newline at end of file diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index aa12bd0f7..f8d1b5361 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -87,8 +87,8 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a .mui-mbar-tabs{ display:none;} /* 顶部小导航 */ -.header-top { background-color: #fafafa; border-bottom: solid 1px #f0f0f0; } -.header{ display:none; max-width:1000px; margin:0px auto; font-size:12px;position: relative; } +.header-top { background-color: #fafafa; border-bottom: solid 1px #f0f0f0; height: 30px; display:none; } +.header{ max-width:1000px; margin:0px auto; font-size:12px;position: relative; } .mobile-navigation{position: fixed;bottom:0px ;width: 100%;z-index: 999;background:#fff ;} .mobile-navigation li{width: 25%;padding:2px ;background:#fff ;border-top:1px solid #f5f5f5 ;float: left;text-align: center;font-size: 12px; position: relative; } @@ -100,7 +100,7 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a @media only screen and (min-width: 640px) { .am-container {padding-left:0px;padding-right:0px ;} .nav-search{background: #fff; margin: 20px 0 5px 0;} - .header { display:block;height: 30px;} + .header-top { display:block;} .top-nav-left{ float:left;} .top-nav-left .top-nav-items, .top-nav-right .top-nav-items { padding: 0px 8px; height: 30px; line-height: 30px; } .top-nav-right {position: absolute; top: 0; right: 0; } diff --git a/public/static/upload/images/common/2019/01/14/1547448748316693.png b/public/static/upload/images/common/2019/01/14/1547448748316693.png old mode 100755 new mode 100644 index 41127360e..64a675c95 Binary files a/public/static/upload/images/common/2019/01/14/1547448748316693.png and b/public/static/upload/images/common/2019/01/14/1547448748316693.png differ