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

public/h5/datigame/css/main.css

@@ -144,8 +144,8 @@ body{
 .cov4 .name{left: 1.7rem;top: -1.2rem;}
 .gstart .name{top: 3.4rem;width: 2rem;left: 50%;margin-left: -1rem;text-align: center;}
 .gstart .cov4  .name{ left: 46%;  }
-.doing.gstart .name{ top:inherit; }
-.doing.gstart .cov4  .name{ left:inherit;  }
+.doing.gstart .name{top: inherit;}
+.doing.gstart .cov4  .name{left: 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

@@ -6,7 +6,7 @@ common={
  		WebSocket:"",
  		bdSocket:"Home/User/Bind",
  		Join:"Home/User/Join",
- 		Answer:"Home/User/Answer",
+ 		Answer:"Home/Game/Answer",
  		Join:"Home/Game/Join",
  		uid:"",
  	},userInfo:{
@@ -146,9 +146,12 @@ common={
  			if(l>0)return;
  			$(this).addClass("cur_answer");
  			_this.data.option_id=$(this).attr("data-option_id");
- 			_this.Answer(function(){
+ 			if(!_this.data.isAnswer){
  				_this.data.isAnswer=true;
- 			});
+	 			_this.Answer(function(){
+	 			});
+ 			}
+ 			
  		})
   },listen:function(){
  		var _this=this;