| 
					
				 | 
			
			
				@@ -124,6 +124,7 @@ layui.use(['form','jquery'], function(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               layer.msg("匹配成功,正在进入房间...", { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 time: 1000 //2秒关闭(如果不配置,默认是3秒) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              $(".g-doc .g-inner").addClass("doing"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               //设置player值 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               if(data.info.players[0]['uid'] == $("#uid").val()){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 $("#py1_avatar").html('<img src="' + data.info.players[0]['avatar'] + '" class="layui-circle">'); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -165,7 +166,7 @@ layui.use(['form','jquery'], function(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               if(data.next == 1){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                if(is_end == 1){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if(data.is_end == 1){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   //结算 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    $(".g-doc .g-inner").addClass("end"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   var py1_score = parseInt($("#py1_score").html()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -187,7 +188,7 @@ layui.use(['form','jquery'], function(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     });  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   //返回逻辑 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                  is_end = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  data.is_end = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   cur_question = 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   room_id = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -221,7 +222,7 @@ layui.use(['form','jquery'], function(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       });  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if(responsedata.code == 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        $(".g-doc .g-inner").addClass("doing"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+         
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     },'json'); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -259,7 +260,7 @@ layui.use(['form','jquery'], function(){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $("#question").html(question); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $("#Jpage").html(responsedata.info.questions_count) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        is_end = responsedata.info.question.is_end; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+       // is_end = responsedata.info.question.is_end; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				          
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         layer.msg(responsedata.msg, { 
			 |