From dfab4fb70e43ea1b2771b785853bb7e3f0a0f3e9 Mon Sep 17 00:00:00 2001
From: txy <421111298@qq.com>
Date: Mon, 15 Jul 2019 16:59:06 +0800
Subject: [PATCH] '路径修改'
---
showPhotos/js/page/common.js | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/showPhotos/js/page/common.js b/showPhotos/js/page/common.js
index 097c3d0..6f74dc3 100644
--- a/showPhotos/js/page/common.js
+++ b/showPhotos/js/page/common.js
@@ -39,15 +39,16 @@ function getToken() {
function transPage(_pageNumber, _activityCode, _token, _addParam) {
var url = '';
var _base = '';
- var pathname = window.location.pathname;
+ var _origin = window.location.origin;
+ var _pathname = window.location.pathname;
var _urlParam = window.location.search;
- var index = pathname.indexOf('/ACTIVITY');
- var secondFolder = '';
+ var index = _pathname.indexOf('/ACTIVITY');
+ var _secondFolder = '';
if(index !== 0){
- secondFolder = pathname.slice(0,index);
+ secondFolder = _pathname.slice(0,index);
}
- _base = pathname + secondFolder;
+ _base = _origin + _secondFolder;
if (typeof _urlParam !== 'undefined' && _urlParam !== '') {
url = _base + "/ACTIVITY/view/" + _activityCode + "/" + _pageNumber + _urlParam + (_addParam !== undefined ? ('&' + _addParam) : '');
--
libgit2 0.27.0