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

public/plugins/layui/css/main.css

@@ -99,10 +99,10 @@ body{
 .cov{ position: absolute; }
 .g-inner{margin: 0 auto;width: 7.5rem;}
 .cov1{left: 50%;top: 3rem;margin-left: -1.2rem;}
-.cov2{left: 50%;top: 9rem;margin-left: -1.5rem;width: 3rem;font-size: .3rem;text-align: center;}
+.cov2{left: 50%;top: 10.5rem;margin-left: -1.5rem;width: 3rem;font-size: .3rem;text-align: center;}
 .cov1 .userface{width: 2.4rem;height: 2.4rem;}
 .cov3{left: 50%;top: 7rem;width: 2rem;margin-left: -1rem;text-align: center;font-size: .8rem;color: #F44336;}
-.cov4{right: 50%;top: 10rem;width: 2rem;margin-right: -1rem;}
+.cov4{right: 50%;top: 8.5rem;width: 2rem;margin-right: -1rem;}
  .userface{border-radius: 50%;overflow: hidden;background-color: #000;display: block;}
 .cov4 .userface{width: 2.0rem;height: 2.0rem;float: right;}
 .doing .cov1{left: 0;margin: 0;top: 1rem;background: #32deec;border-radius: 1rem;width: 4rem;}
@@ -145,15 +145,16 @@ body{
     text-align: center;
     line-height: 1.15rem;
     margin-bottom: .5rem;
+    overflow: hidden;
 }
 .qs-item li .answer {
     width: 100%;
     height: 100%;
     margin: 0;
-    background: transparent;
+    /* background: transparent; */
     border: 0;
 }
-.qs-item li.on{
+.qs-item li.on,.qs-item .cur_answer{
      background-color:#ffb93b;
      color: #FFF;
 }

resources/views/home/user.blade.php

@@ -57,7 +57,7 @@
           <li class="item item2">新疆</li>
           <li class="item item3">西藏</li> -->
         </ul>
-        <div class="page" id="Jpage">1/5</div>
+        <div class="page" id="Jpage"></div>
       </div>
       <div class="result">
         <span class="icon top-icon success"></span>

resources/views/home/user2.blade.php

@@ -108,6 +108,7 @@
   </div> 
 {!!Html::script('plugins/layui/layui.js')!!}
 <script>
+var is_end = 0;
 layui.use(['form','jquery'], function(){
   var form = layui.form;
   var $ = layui.$;
@@ -115,7 +116,7 @@ layui.use(['form','jquery'], function(){
   var client_id = '';
   var room_id = '';
   var cur_question = 1;
-  var is_end = 0;
+
   $.ajaxSetup({
       headers: {
           'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
@@ -158,6 +159,7 @@ layui.use(['form','jquery'], function(){
               break;
           case 'match':
               console.log(data);
+              $(".g-doc .g-inner").addClass("doing");
               layer.msg("匹配成功，正在进入房间...", {
                 time: 1000 //2秒关闭（如果不配置，默认是3秒）
               });
@@ -175,10 +177,7 @@ layui.use(['form','jquery'], function(){
                 $("#py2_username").html(data.info.players[0]['username']);
                 $("#duishou").val(data.info.players[0]['uid']);
               }
-              $("#userinfo").hide();
-              $("#start_game").show();
-              $("#out_game").hide();
-              $("#game").show();
+              
               if(data.info.room_id){
                 room_id = data.info.room_id;
                 getQuestion(data.info.room_id, cur_question);
@@ -204,7 +203,7 @@ layui.use(['form','jquery'], function(){
               if(data.next == 1){
                 if(is_end == 1){
                   //结算
-                   $(".g-doc .g-inner").addClass("end");
+                  $(".g-doc .g-inner").addClass("end");
                   var py1_score = parseInt($("#py1_score").html());
                   var py2_score = parseInt($("#py2_score").html());
                   var url = 'quit.php';
@@ -258,7 +257,7 @@ layui.use(['form','jquery'], function(){
       }); 
       if(responsedata.code == 0){
        
-        $(".g-doc .g-inner").addClass("doing");
+        
           
       }
     },'json');
@@ -294,7 +293,7 @@ layui.use(['form','jquery'], function(){
           question += '<button class="answer layui-btn layui-btn-primary" style="margin-top: 25px;" data-id="'+answers[i].id+'">'+answers[i].title+'</button><br>';
         }
         $("#question").html(question);
-        is_end = responsedata.info.is_end;
+        //is_end = responsedata.info.is_end;
       }else{
         layer.msg(responsedata.msg, {
           time: 1000 //2秒关闭（如果不配置，默认是3秒）