'调整页面跳转'

showPhotos/js/page/common.js

@@ -37,19 +37,22 @@ function getToken() {
 
 // 页面跳转
 function transPage(_pageNumber, _activityCode, _token, _addParam) {
-  var url = ''
-  // if (typeof _urlParam !== 'undefined' && _urlParam !== '') {
-  //     url = baseUrl + "/ACTIVITY/view/" + _activityCode + "/" + _pageNumber + '?' + _urlParam;
-  // } else {
-  //     url = baseUrl + "/ACTIVITY/view/" + _activityCode + "/" + _pageNumber;
-  // }
-
-  var _urlParam = location.search;
+  var url = '';
+  var _base = '';
+  var pathname = window.location.pathname;
+  var _urlParam = window.location.search;
+  var index = pathname.indexOf('/ACTIVITY');
+  var secondFolder = '';
+  
+  if(index !== 0){
+    secondFolder = pathname.slice(0,index);
+  }
+  _base = pathname + secondFolder;
  
   if (typeof _urlParam !== 'undefined' && _urlParam !== '') {
-      url = "/ACTIVITY/view/" + _activityCode + "/" + _pageNumber + _urlParam + (_addParam !== undefined ? ('&' + _addParam) : '');
+      url = _base + "/ACTIVITY/view/" + _activityCode + "/" + _pageNumber + _urlParam + (_addParam !== undefined ? ('&' + _addParam) : '');
   } else {
-      url = "/ACTIVITY/view/" + _activityCode + "/" + _pageNumber + (_addParam !== undefined ? ('?' + _addParam) : '');
+      url = _base + "/ACTIVITY/view/" + _activityCode + "/" + _pageNumber + (_addParam !== undefined ? ('?' + _addParam) : '');
   }
 
   var _form = document.createElement('form');