Merge branch 'master' of http://120.78.169.79:3000/zhengxiaoyu/datiGame

resources/views/home/user.blade.php

@@ -79,6 +79,7 @@ layui.use(['form','jquery'], function(){
   var room_id = '';
   var cur_question = 1;
   var is_end = 0;
+  var ts;
   $.ajaxSetup({
       headers: {
           'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
@@ -143,7 +144,18 @@ layui.use(['form','jquery'], function(){
             
               if(data.info.room_id){
                 room_id = data.info.room_id;
-                getQuestion(data.info.room_id, cur_question);
+                var sum=10;
+                ts=setInterval(function(){
+                  
+                  layer.msg(sum--, {
+                    time: 1000 //2秒关闭（如果不配置，默认是3秒）
+                  }); 
+                  if(sum==0){
+                    getQuestion(data.info.room_id, cur_question);
+                    sum=10;
+                  }
+                },1000)
+                
               }
               break;
           case 'answer':
@@ -167,6 +179,7 @@ layui.use(['form','jquery'], function(){
                 var py2_score = parseInt($("#py2_score").html());
                 if(data.is_end == 1){
                   //结算
+                   clearInterval(ts)
                    $(".g-doc .g-inner").addClass("end");
                   
                   var url = 'Quit';