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

public/h5/datigame/css/main.css

@@ -222,6 +222,31 @@ background-color:#009688;
      color: #FFF;
      box-shadow: 0 0.1rem 0rem #4CAF50;
 }
+.qs-item li.player_true em::after{
+  content:"";
+  position:absolute;
+  right: 0.3rem;
+  top: .3rem;
+  width: .35rem;
+  height: .35rem;
+  border: solid .1rem #c3c3c3;
+  border-radius: 50%;
+}
+ 
+.qs-item li.player_error em::before{content:"";position:absolute;right: .5rem;top: .5rem;width: .5rem;height: .1rem;background: #c3c3c3;border-radius: .1rem;-webkit-transform: rotate(-45deg);transform: rotate(-45deg);}
+.qs-item li.player_error em::after{
+  content:"";
+  content: "";
+  position: absolute;
+  right: .7rem;
+  top: .3rem;
+  width: .1rem;
+  height: .5rem;
+  background: #c3c3c3;
+  border-radius: .1rem;
+  -webkit-transform: rotate(-45deg);
+  transform: rotate(-45deg);
+}
 .qs-item .cur_answer.cur_error::before{content:"";position:absolute;left: .5rem;top: .5rem;width: .5rem;height: .1rem;background: #FFF;border-radius: .1rem;-webkit-transform: rotate(-45deg);transform: rotate(-45deg);}
 .qs-item .cur_answer.cur_error::after{
   content:"";
@@ -379,7 +404,7 @@ background-color:#009688;
     top: .5rem;
 }
 .popbg{display: none;position: fixed;left: 0;top: 0;width: 100%;height: 100%;background: rgba(0,0,0,0.5);z-index: 90;}
-.covxlz{ width: 2.86rem;left: 50%; margin-left: -1.43rem; top: 11rem; height: 1rem; border-radius: .5rem; background-color: #a7a8c5;line-height: 1rem;text-align: center;color: #222e71 }
+.covxlz{width: 2.86rem;left: 50%;margin-left: -1.43rem;top: 11.5rem;height: 1rem;border-radius: .5rem;background-color: #a7a8c5;line-height: 1rem;text-align: center;color: #222e71;}
 .con {
   position:relative;
   display:inline-block;

public/h5/datigame/js/common.js

@@ -74,7 +74,7 @@ common={
         if(data.info.user.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.data.playerId=data.info.user.user_id;
+            _this.userInfo.playerId=data.info.user.user_id;
      }
  		 
  	},round_end:function(data){
@@ -90,25 +90,25 @@ common={
           	}
           }
           $("#question .item").each(function(){
-          	if($(this).attr("option_id")==data.info.anwser){
+          	if($(this).attr("data-option_id")==data.info.anwser){
           		$(this).addClass("cur_true");
           	}
-          	if($(this).attr("option_id")!=data.info.anwser&&$(this).hasClass("cur_answer")){
+          	if($(this).attr("data-option_id")!=data.info.anwser&&$(this).hasClass("cur_answer")){
           		
           		$(this).addClass("cur_error");
           	}
           	
-          	if($(this).attr("option_id")==_this.data.player_answerId&&$(this).attr("option_id")==data.info.anwser){
+          	if($(this).attr("data-option_id")==_this.data.player_answerId&&$(this).attr("data-option_id")==data.info.anwser){
           		//对方答案
           		$(this).addClass("player_true");
           	}
-          	if($(this).attr("option_id")==_this.data.player_answerId&&$(this).attr("option_id")!=data.info.anwser){
+          	if($(this).attr("data-option_id")==_this.data.player_answerId&&$(this).attr("data-option_id")!=data.info.anwser){
           		//对方答案
           		$(this).addClass("player_error");
           	}
            
           })
-
+          clearInterval(this.data.ts);
           
  	},onSocket:function(e){
  		var data=JSON.parse(e.data);
@@ -135,7 +135,7 @@ common={
           case "answer":
           if(_this.userInfo.user_id==data.user_id){
           	_this.increment($("#py1_score"),data.score);
-          }else if(_this.data.playerId==data.user_id){
+          }else if(_this.userInfo.playerId==data.user_id){
           	_this.increment($("#py2_score"),data.score);
           }
           break;
@@ -174,7 +174,7 @@ common={
         var question="";
         var answers = responsedata.info.options
         for(var i in answers){
-          question += '<li class="btn-2 item item'+i+' answer layui-btn layui-btn-primary"   data-option_id="'+answers[i].option_id+'">'+answers[i].title+'</li>';
+          question += '<li class="btn-2 item item'+i+' answer layui-btn layui-btn-primary"   data-option_id="'+answers[i].option_id+'"><em></em>'+answers[i].title+'</li>';
         }
         $("#question").html(question);
         $("#Jpage").html(responsedata.info.questions_count+"/5");
@@ -210,8 +210,7 @@ common={
  		})
  		
  		
- 	},increment:function(bdclass,num){
- 		 var obj=$("."+bdclass);
+ 	},increment:function(obj,num){
  		 var text=obj.text();
 		obj.prop('Counter',text).animate({
 			Counter: num