'调整调用顺序'

showPhotos/js/page/common.js

 data.htmlJson = JSON.parse(data.htmlJson);
 
+// 设置token
+function setToken(){
+  if(user.token !== '') {
+    sessionStorage.setItem('x-token', user.token);
+  }else {
+    sessionStorage.setItem('x-token', '');
+  }
+}
+
+// 获取token
+function getToken() {
+  var t = sessionStorage.getItem('x-token');
+  return t
+}
+
 // 页面跳转
 function transPage(_pageNumber, _activityCode, _token, _urlParam) {
   var url = ''

showPhotos/js/page/index.js

 // 公共变量
-var xtoken = "123123";
 var activityCode = rules.acActivity.code;
 var pageNumber = "1";
 var baseUrl = "https://space-api.check.icaremgt.com";
@@ -14,7 +13,7 @@ var gb_rank_loaded = false
 var gb_token = 'admin.725.fbbd4294a56047e7926b7ebab088ade4'
 
 $(function(){
-    
+    setToken();
     btnBindClick();// 绑定点击事件
     removeAttr();
     getAjaxListSearch('player',1,function(playerListData){
@@ -131,7 +130,8 @@ function btnBindClick() {
     $("#act31527459124456").off("click").on("click",function(){
 
         // window.location.href = '/signup.html'
-        transPage(activityCode,'2',xtoken);
+        var _t = getToken();
+        transPage(activityCode,'2',_t);
     });
 
     // 继续投票
@@ -369,5 +369,6 @@ function voteClickFn(){
 function playPageFn() {
   var id = $(this).attr('id');
   var urlParam = '?UserId='+id;
-  transPage('3',activityCode,xtoken,urlParam);
+  var _t = getToken();
+  transPage('3',activityCode,_t,urlParam);
 }
\ No newline at end of file

showPhotos/js/page/user.js

@@ -4,13 +4,17 @@ var baseUrl = "https://space-api.check.icaremgt.com";
 
 var gb_vote_loaded = false
 
+// 微信鉴权
+wxpermission();
+// 加载html结构
+loadHtmlJson();
+
 $(function(){
-    loadHtmlJson();
+    setToken();
     btnBindClick();// 绑定点击事件
     var showTime = new Date(rules.acActivity.endTime).getTime() - new Date(currentTime)
     userCountDown(showTime/1000,$('#act31142119991744 span'));  //倒计时
     userTabInfo();
-    wxpermission();
 });
 
 // 微信鉴权