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

resources/views/home/user.blade.php

@@ -36,8 +36,8 @@
       </div>
 
       <div class="cov cov1 amt"><span class="userface" id="avatar"></span>
-        <b id="username"></b>
-        <span class="num" id="py1_score">940</span>
+        <b id="username" class="name"></b>
+        <span class="num" id="py1_score">0</span>
       </div>
       <div class="cov cov2 amt">
         <button id="start_game" class="layui-btn layui-btn-normal" style="margin-top: 20px;">匹配对手</button>
@@ -47,17 +47,17 @@
       <div class="cov cov3 amt">vs</div>
       <div class="cov cov4 amt">
         <span class="userface" id="py2_avatar" ></span>
-        <b id="py2_username"></b>
-        <span class="num"  id="py2_score">720</span>
+        <b id="py2_username" class="name"></b>
+        <span class="num"  id="py2_score">0</span>
       </div>
       <div class="qs-item" >
-        <span class="tit">西气东输是把哪里的天然气往华北输送</span>
+        <span class="tit" id="Jqtitle"></span>
         <ul class="list" id="question">
           <li class="item item1 on">四川</li>
           <li class="item item2">新疆</li>
           <li class="item item3">西藏</li>
         </ul>
-        <div class="page">1/5</div>
+        <div class="page" id="Jpage">1/5</div>
       </div>
       <div class="result">
         <span class="icon top-icon success"></span>
@@ -251,13 +251,16 @@ layui.use(['form','jquery'], function(){
     var url = '/Home/Game/Question';
     $.get(url, {room_id:room_id, cur_question:index}, function(responsedata){
       if(responsedata.code == 0){
-        var question = '<b>'+ responsedata.info.title +'</b><br/>';
-        var answers = responsedata.info.answers
+        $("#Jqtitle").html(responsedata.info.question.title );
+        var question="";
+        var answers = responsedata.info.options
         for(var i in answers){
-          question += '<button class="answer layui-btn layui-btn-primary" style="margin-top: 25px;" data-id="'+answers[i].id+'">'+answers[i].title+'</button><br>';
+          question += '<li class="item item'+i+'"><button class="answer layui-btn layui-btn-primary" style="margin-top: 25px;" data-id="'+answers[i].option_id+'">'+answers[i].title+'</button></li>';
         }
         $("#question").html(question);
-        is_end = responsedata.info.is_end;
+        $("#Jpage").html(responsedata.info.questions_count)
+        is_end = responsedata.info.question.is_end;
+        
       }else{
         layer.msg(responsedata.msg, {
           time: 1000 //2秒关闭（如果不配置，默认是3秒）
@@ -273,7 +276,7 @@ layui.use(['form','jquery'], function(){
     var url = '/Home/Game/Answer';
     var answer = $(this).data("id");
     $(this).addClass("cur_answer");
-    $.post(url, {answer:answer,cur_question:cur_question,room_id:room_id,client_id:client_id,is_end:is_end}, function(responsedata){
+    $.get(url, {answer:answer,cur_question:cur_question,room_id:room_id,client_id:client_id,is_end:is_end}, function(responsedata){
       console.log(responsedata);
     });
     cur_question = cur_question + 1;