瀏覽代碼

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

郑晓宇 6 年之前
父節點
當前提交
da9eaea0b8
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      public/h5/datigame/js/common.js

+ 3 - 2
public/h5/datigame/js/common.js

@@ -8,13 +8,13 @@ common={
  		Answer:"Home/Game/Answer",
  		Join:"Home/Game/Join",
  		uid:"",
- 		question_id:0
+ 		option_id:0
  	},userInfo:{
 
  	},GET: function (name) {
       var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
       var r = window.location.search.substr(1).match(reg);
-        if (r != null) return unescape(r[2]);
+        if (r != null) return r[2];
         return null;
      },getUserInfo:function(fn){
      	var _this=this;
@@ -295,6 +295,7 @@ common={
 	            _this.data.angle = 0;
 	            leftContent.setAttribute('style', 'transform: rotate(0deg)');
 	            rightContent.setAttribute('style', 'transform: rotate(0deg)');
+	             clearInterval(_this.data.ts);
 	        }
 	    }, 1000)
 }, tips: function (text, time) {