Browse Source

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

郑晓宇 6 years ago
parent
commit
ec3837bc50
2 changed files with 16 additions and 4 deletions
  1. 4 0
      public/plugins/layui/css/main.css
  2. 12 4
      resources/views/home/user.blade.php

+ 4 - 0
public/plugins/layui/css/main.css

@@ -133,6 +133,10 @@ body{
     top: 1.5rem;
 }
 .cov4 .name{left: 2.8rem;}
+.gstart .name{ top: 3rem; }
+.gstart .cov4  .name{ left: 46%;  }
+.doing.gstart .name{ top:inherit; }
+.doing.gstart .cov4  .name{ left:inherit;  }
 .doing  .qs-item{ display:block}
 .qs-item{padding: 4.8rem 1rem 0;display: none;position: absolute;left: 0;top: 0;z-index: 99;}
 .qs-item .tit{color: #FFF;font-size: .4rem;text-align: center;display: block;margin-bottom: .2rem;}

+ 12 - 4
resources/views/home/user.blade.php

@@ -19,7 +19,7 @@
 </head>
 <body> 
 <div class="g-doc">
-    <div class="g-inner">
+    <div class="g-inner gstart">
       <div class="login">
         
       </div>
@@ -60,8 +60,8 @@
         <div class="page" id="Jpage"></div>
       </div>
       <div class="result">
-        <span class="icon top-icon success"></span>
-        <span class="live">初级玩家</span>
+        <span class="icon top-icon success" id="Jresult"></span>
+        <span class="live" id="Jlastmsg">初级玩家</span>
         <span class="btn btn1">再来一局</span>
         <span class="btn btn2">查看等级</span>
       </div>
@@ -124,6 +124,7 @@ layui.use(['form','jquery'], function(){
               layer.msg("匹配成功,正在进入房间...", {
                 time: 1000 //2秒关闭(如果不配置,默认是3秒)
               });
+              $(".g-doc .g-inner").removeClass("gstart");
               $(".g-doc .g-inner").addClass("doing");
               //设置player值
               if(data.info.players[0]['uid'] == $("#uid").val()){
@@ -171,16 +172,23 @@ layui.use(['form','jquery'], function(){
                    $(".g-doc .g-inner").addClass("end");
                   var py1_score = parseInt($("#py1_score").html());
                   var py2_score = parseInt($("#py2_score").html());
-                  var url = 'quit.php';
+                  var url = 'Quit';
                   if(py1_score > py2_score){
                     layer.msg('恭喜你获得胜利', {icon: 1, time: 2000}, function(){
                     });
+                    $("#Jresult").removeClass("failed");
+                    $("#Jresult").addClass("success");
+                    $("#Jlastmsg").html("恭喜你获得胜利")
                   }else if(py1_score == py2_score){
                     layer.msg('打成平手', {icon: 2, time: 2000}, function(){
                     });
+                    $("#Jlastmsg").html("打成平手")
                   }else{
                     layer.msg('您输了比赛', {icon: 5, time: 2000}, function(){
                     });
+                    $("#Jlastmsg").html("您输了比赛")
+                    $("#Jresult").removeClass("success");
+                    $("#Jresult").addClass("failed");
                   }
                   $.get(url, {room_id,room_id},function(){
                     layer.msg("您已退出对战", {