Merge branch 'test'

application/app/view/index/baidu_send.html

@@ -171,7 +171,7 @@
 		<div class="header_img" class="overflow">
 			<img src="/app/images/h57@2x.png" class="w-h-100"/>
 		</div>
-		<div class="shop_img_data overflow">
+		<!--<div class="shop_img_data overflow">
 			<div class="w-50 ">
 				<div style="text-align:center;margin-left:.7rem;">
 					<img src="/app/images/h59@2x.png" style="width:1.86rem;"/>
@@ -186,7 +186,7 @@
 					<div><span style="color:#F79130 ; font-size:0.22rem;">上周成交量</span></div>
 				</div>
 			</div>
-		</div>
+		</div>-->
 		<div class="text-area overflow">
 			<img src="/app/images/h5@2x.png" class="desc_title overflow"/>
 			<div class="left_radio overflow">	

application/index/extend/Basic.php

@@ -230,7 +230,8 @@ class Basic extends Controller
                 if($this->request->isAjax()){
                     //echo json_encode(array( "code" => "300", "msg" => "没有权限！", "data" => [], "type" => "json" ));exit;
                 } else {
-                    $this->error('没有当前页面权限');exit;
+//                    $this->error('没有当前页面权限');exit;
+                    echo json_encode(array( "code" => "101", "msg" => "没有当前页面权限", "data" => [], "type" => "json" ));exit;
                 }
             }
         }
@@ -244,21 +245,23 @@ class Basic extends Controller
     public function userVerify(){
         $this->lastLoginTime = Session::get("lastLoginTime");
         if(empty($this->userName) || empty($this->userId) || empty($this->lastLoginTime) ){
-            if ($this->request->isAjax()) {
-                echo json_encode(array( "code" => "101", "msg" => "登录失效,请重新登录", "data" => [], "type" => "json" ));exit;
-            } else {
-                $this->redirect('/index/login');
-            }
+            echo json_encode(array( "code" => "101", "msg" => "登录失效,请重新登录", "data" => [], "type" => "json" ));exit;
+//            if ($this->request->isAjax()) {
+//                echo json_encode(array( "code" => "101", "msg" => "登录失效,请重新登录", "data" => [], "type" => "json" ));exit;
+//            } else {
+//                $this->redirect('/index/login');
+//            }
         }
 
         $time = time();
         //登录有效期判断
         if (($time - $this->lastLoginTime) > 36000) {
-            if ($this->request->isAjax()) {
-                echo json_encode(array( "code" => "101", "msg" => "登录失效,请重新登录", "data" => [], "type" => "json" ));exit;
-            } else {
-                $this->redirect('/index/login');die;
-            }
+            echo json_encode(array( "code" => "101", "msg" => "登录失效,请重新登录", "data" => [], "type" => "json" ));exit;
+//            if ($this->request->isAjax()) {
+//                echo json_encode(array( "code" => "101", "msg" => "登录失效,请重新登录", "data" => [], "type" => "json" ));exit;
+//            } else {
+//                $this->redirect('/index/login');die;
+//            }
         } else {
             //更新时间
             Session::set("lastLoginTime", $time);

public/resource/js/mainIndex.js

@@ -24,8 +24,12 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
 			var sceenWidth = window.screen.width < 1200 ? 1200 : window.screen.width ; 
 			var width = sceenWidth - $('#sidebar-wrapper').width() + "px !important";
 			var sceen = sceenWidth+ "px !important";
-			
-			$('#mainFrameTabs').attr("style","min-width:959px !important");
+			if ( sceenWidth == 1200 ){
+				$('#mainFrameTabs').attr("style","width:1023px !important");
+			} else {
+				$('#mainFrameTabs').attr("style","min-width:1023px !important");
+			}
+
 			$('#wrapper').attr("style","min-width:"+sceen );
 			$('#headTileNavBar').attr("style","min-width:"+sceen);
           	menu_bar(function(){
@@ -73,7 +77,7 @@ define (['doT', 'text!temp/menu_template_tpl.html','ckfinder','ckfinderStart', '
 		       //登录时间无效 直接跳转登录页面
 		        if(!user_info_obj){
 				    alert('登录失效，请您重新登录');
-		        	window.location.href="login.html";
+//		        	window.location.href="login.html";
 		        }
 		        $ ("#menu_bar").append (template);
 		        if (user_info_obj) {

public/resource/lib/js/checkLoginFailureAjax.js

@@ -8,7 +8,7 @@ function checkLogin(){
 			success: function(data) {
 				if(data.code == 300){
 					alert('登录失效，请您重新登录');
-        	        window.location.href="login.html";
+//      	        window.location.href="login.html";
 				}
 			}
 		});