'调整调用顺序'

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/signup.js

-    // 公共变量
-    var pageNumber = "1";
-    var baseUrl = "https://space-api.check.icaremgt.com";
+// 公共变量
+var pageNumber = "1";
+var baseUrl = "https://space-api.check.icaremgt.com";
 
-    $(function () {
+// 微信鉴权
+wxpermission();
+// 加载html结构
+loadHtmlJson();
+
+$(function () {
+    setToken();
     removeAttr();
     btnBindClick();// 绑定点击事件
     $('#act11739232574395').attr({ 'readonly': 'readonly' });
-        wxpermission();
     getOrgNameFn();
-        loadHtmlJson();
-    })
+})
 
-    // 微信鉴权
-    function wxpermission() {
+// 微信鉴权
+function wxpermission() {
     wx.ready(function () {
         var shareData = {
             title: "",
@@ -52,10 +56,10 @@
             }
         });
     });
-    }
+}
 
-    // 元素点击事件绑定
-    function btnBindClick() {
+// 元素点击事件绑定
+function btnBindClick() {
     // 返回首页
     $("#act11534485971254").off("click").on("click", function () {
         window.location.href = '/index.html'
@@ -195,10 +199,10 @@
             }
         })
     });
-    }
+}
 
-    // 获取机构名称
-    function getOrgNameFn() {
+// 获取机构名称
+function getOrgNameFn() {
     $.ajax({
         type: 'GET',
         url: baseUrl + '/ORG/hospital/community/hospitalInfo/' + getQueryString('orgId'),
@@ -211,9 +215,9 @@
             showMessage('找不到此机构',3000,true);
         }
     })
-    }
+}
 
-    function selectFileImage(fileObj) {
+function selectFileImage(fileObj) {
     var file = fileObj.files['0'];
     //图片方向角 added by lzk  
     var Orientation = null;
@@ -299,10 +303,10 @@
         };
         oReader.readAsDataURL(file);
     }
-    }
+}
 
-    //对图片旋转处理 
-    function rotateImg(img, direction, canvas) {
+//对图片旋转处理 
+function rotateImg(img, direction, canvas) {
     //最小与最大旋转方向，图片旋转4次后回到原方向    
     var min_step = 0;
     var max_step = 3;
@@ -352,10 +356,10 @@
             ctx.drawImage(img, -width, 0);
             break;
     }
-    }
+}
 
-    // 验证身份证
-    function validateIDNumber(card) {
+// 验证身份证
+function validateIDNumber(card) {
     var vcity = {
         11: '北京', 12: '天津', 13: '河北', 14: '山西', 15: '内蒙古',
         21: '辽宁', 22: '吉林', 23: '黑龙江', 31: '上海', 32: '江苏',
@@ -483,4 +487,4 @@
         return false
     }
     return true
-    }
+}

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();
 });
 
 // 微信鉴权