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

resources/views/home/user.blade.php

@@ -227,7 +227,7 @@ layui.use(['form','jquery'], function(){
                  
                   return false;
                 }
-                if(data.cur_quc == 2){
+                if(data.cur_quc == 2&&data.is_end!=1){
                   getQuestion(room_id, cur_question);
                 }