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

public/h5/datigame/css/main.css

@@ -155,7 +155,7 @@ body{
 .gstart .name{top: 3.4rem;width: 2rem;height: .5rem;left: 50%;margin-left: -1rem;text-align: center;overflow: hidden;}
 .gstart .cov4  .name{left: 46%;}
 .doing.gstart .name{top: inherit;}
-.doing.gstart .cov4  .name{left: 2.0rem;top: -1rem;}
+.doing.gstart .cov4  .name{left: 2.0rem;top: -1rem;height: .5rem;}
 .doing  .qs-item{display:block;width: 5.50rem;}
 .doing  .cov4 .userface{opacity:1;width: 1rem;height: 1rem;left: 2.3rem;background: url(../img/user0-face.png);background-size: 100%;}
 .doing   .userface img{
@@ -386,7 +386,10 @@ background-color:#009688;
     top: 8rem;
    
 }
-.vsmov .win_rate{opacity:1;}
+ 
+.vsmov.doing .win_rate{opacity:1;font-size: .34rem;font-weight: bold;margin-left: -.2rem;}
+.doing .win_rate{opacity:0; }
+.vsmov.doing #py2_score,.vsmov.doing #py1_score{opacity:0}
 .vsmov .vspic{
   display:block;
   opacity:1;
@@ -427,7 +430,7 @@ background-color:#009688;
     -webkit-animation-iteration-count: 1;
     animation-iteration-count:1;
 }
-.win_rate{opacity:0}
+
 .popwind{width:6.05rem;height:6.98rem;position: absolute;left: 0.8rem;top: 2.5rem;background: url(../img/rulebg.png);background-size: 100%;display: none;z-index: 99;}
 .popwind .art{
     padding: 1.1rem .82rem .4rem;

public/h5/datigame/js/common.js

@@ -77,9 +77,9 @@ common={
         	$("#py2_avatar").html('<img src="' + data.info.players[i].avatar+ '" class="layui-circle">');
             $("#py2_username").html(data.info.players[i].name);
             _this.userInfo.playerId=data.info.players[i].user_id;
-            $("#win_rate1").html(data.info.players[i].win_rate*100);
+            $("#win_rate1").html("胜率："+data.info.players[i].win_rate+"%");
      	}else{
-     		$("#win_rate2").html(data.info.players[i].win_rate*100);
+     		$("#win_rate2").html("胜率："+data.info.players[i].win_rate+"%");
      	}
    	}