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

public/h5/datigame/css/main.css

@@ -334,15 +334,7 @@ background-color:#009688;
     -webkit-animation-iteration-count: infinite;
     animation-iteration-count: infinite;
 }
-.layui-btn:hover {
-    opacity:.8;
-    filter:alpha(opacity=80);
-    color:#fff
-}
-.layui-btn:active {
-    opacity:1;
-    filter:alpha(opacity=100)
-}
+ 
 .layui-btn+.layui-btn {
     margin-left:10px
 }

public/h5/datigame/js/common.js

@@ -8,6 +8,7 @@ common={
  		Answer:"Home/Game/Answer",
  		Join:"Home/Game/Join",
  		uid:"",
+ 		question_id:0
  	},userInfo:{
 
  	},GET: function (name) {