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

public/h5/datigame/js/common.js

@@ -110,6 +110,32 @@ common={
           })
           clearInterval(this.data.ts);
           
+ 	},game_end:function(){
+ 			var _this=this;
+ 		
+ 		var py1_score=$("#py1_score").text();
+ 		var py2_score=$("#py2_score").text();
+ 		if(py1_score > py2_score){
+                     
+                     _this.tips('恭喜你获得胜利');
+                    $("#Jresult").removeClass("faild");
+                    $("#Jresult").addClass("success");
+                    $("#Jlastmsg").html("恭喜你获得胜利")
+                  }else if(py1_score == py2_score){
+                     
+                    _this.tips('打成平手');
+                    $("#Jlastmsg").html("打成平手")
+                    $("#Jresult").removeClass("success");
+                    $("#Jresult").removeClass("faild");
+                    $("#Jresult").html($("#avatar").html())
+                  }else{
+                    _this.tips('您输了比赛');
+                    $("#Jlastmsg").html("您输了比赛")
+                    $("#Jresult").removeClass("success");
+                    $("#Jresult").addClass("faild");
+                  }
+         $(".g-doc .g-inner").addClass("end");
+         $("#Jvs").hide();
  	},onSocket:function(e){
  		var data=JSON.parse(e.data);
  			var _this=this;
@@ -140,8 +166,7 @@ common={
           }
           break;
           case 'game_end':
-          $(".g-doc .g-inner").addClass("end");
-          $("#Jvs").hide();
+          _this.game_end(data);
           console.log("游戏结束");
           break;
           
@@ -177,7 +202,7 @@ common={
           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");
+        $("#Jpage").html(responsedata.info.sequence+"/5");
         
            $(".g-doc .g-inner").addClass("doing");
        // is_end = responsedata.info.question.is_end;