Merge branch 'develop' of gitlab.icaremgt.com:tanxinyu/h5_activity into develop

showPhotos/js/page/index.js

@@ -10,7 +10,6 @@ loadHtmlJson();
 
 var gb_player_loaded = false
 var gb_rank_loaded = false
-var gb_token = 'admin.725.fbbd4294a56047e7926b7ebab088ade4'
 
 $(function(){
     setToken();

showPhotos/js/page/signup.js

 // 公共变量
 var pageNumber = "1";
+var activityCode = rules.acActivity.code
 var baseUrl = "https://space-api.check.icaremgt.com";
 
 // 微信鉴权
@@ -96,7 +97,7 @@ function btnBindClick() {
         $.ajax({
             type: 'POST',
             url: 'http://api-admin-manage.check.icaremgt.com/system/components/upload',
-            headers: { 'x-token': user.token },
+            headers: { 'x-token': getToken() },
             data: formData,
             contentType: false,
             processData: false,
@@ -193,7 +194,6 @@ function btnBindClick() {
                 params['x'+ (i+1)] = $('#'+addInput[i].id).val()
             }
         }
-        var activityCode = rules.acActivity.code
         $.ajax({
             type: 'POST',
             headers: {'content-type': 'application/json'},

showPhotos/js/page/user.js

 // 公共变量
 var pageNumber = "1";
+var activityCode = rules.acActivity.code;
 var baseUrl = "https://space-api.check.icaremgt.com";
 
 var gb_vote_loaded = false
@@ -12,7 +13,7 @@ loadHtmlJson();
 $(function(){
     setToken();
     btnBindClick();// 绑定点击事件
-    var showTime = new Date(rules.acActivity.endTime).getTime() - new Date(currentTime)
+    var showTime = new Date(rules.acActivity.endTime).getTime() - new Date(currentTime).getTime()
     userCountDown(showTime/1000,$('#act31142119991744 span'));  //倒计时
     userTabInfo();
 });
@@ -142,7 +143,6 @@ function userCountDown(times,ids){
 
 // 个人信息展示
 function userTabInfo() {
-    var activityCode = rules.acActivity.code
     var id = getQueryString('UserId')?getQueryString('UserId'):user.id;
     var params = {
         id: id,
@@ -179,7 +179,6 @@ function voteClickFn(){
   var params = {
     userId: id
   }
-  var activityCode = rules.acActivity.code;
   if(gb_vote_loaded) {
     return
   }