Merge pull request #20 from hankaibo/master
fix: 修复 # 在 ? 之前时,location.search取值为空问题
This commit is contained in:
commit
ea5b834aa5
@ -7,8 +7,14 @@ export function getNowTime () {
|
||||
}
|
||||
|
||||
export function getUrlParam (name) {
|
||||
const search = window.location.search;
|
||||
if (search !== '') {
|
||||
let {search} = window.location;
|
||||
const {hash} = window.location;
|
||||
// # 在 ? 之前,即 http://localhost/#file?key=value,会导致 search 为空。
|
||||
if (search === '' && hash !== '') {
|
||||
// 为 search 补上前缀'?',以便后面的逻辑处理不变。
|
||||
search = `?${hash.split('?')[1]}`;
|
||||
}
|
||||
if (search !== '' && search !== undefined) {
|
||||
const reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
|
||||
const r = search.substr(1).match(reg);
|
||||
if (r != null) {
|
||||
@ -103,4 +109,4 @@ export const isMacOs = hasUaName('macintosh');
|
||||
|
||||
export const isOldEdge = hasUaName('edge') && !hasUaName('chrome');
|
||||
|
||||
export const isIE = isOldEdge || hasUaName('trident') || hasUaName('msie');
|
||||
export const isIE = isOldEdge || hasUaName('trident') || hasUaName('msie');
|
||||
|
Loading…
x
Reference in New Issue
Block a user