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

public/h5/datigame/css/main.css

@@ -142,10 +142,10 @@ body{
     text-shadow: 2px 2px 0px #820b3e;
 }
 .cov4 .name{left: 1.7rem;top: -1.2rem;}
-.gstart .name{top: 3.4rem;width: 2rem;left: 50%;margin-left: -1rem;text-align: center;}
+.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: 2rem;top: -1rem;}
+.doing.gstart .cov4  .name{left: 1.2rem;top: -1rem;}
 .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{

public/h5/datigame/js/common.js

@@ -73,9 +73,9 @@ common={
    	this.tips(data.info.user.name+"加入了房间")
    	for (var i = 0; i < data.info.players.length; i++) {
    		 if(data.info.players[i].user_id!=_this.userInfo.user_id){
-        	$("#py2_avatar").html('<img src="' + data.info.user.avatar+ '" class="layui-circle">');
-            $("#py2_username").html(data.info.user.name);
-            _this.userInfo.playerId=data.info.user.user_id;
+        	$("#py2_avatar").html('<img src="' + data.info.players[i].avatar+ '" class="layui-circle">');
+            $("#py2_username").html(data.info.players[i].user.name);
+            _this.userInfo.playerId=data.info.players[i].user_id;
      	}
    	}
         
@@ -293,7 +293,7 @@ common={
 	            _this.data.sum = 9;
 	            _this.data.angle = 0;
 	            leftContent.setAttribute('style', 'transform: rotate(0deg)');
-	            rightContent.setAttribute('style', 'transform: rotate(0deg)')
+	            rightContent.setAttribute('style', 'transform: rotate(0deg)');
 	        }
 	    }, 1000)
 }, tips: function (text, time) {