From 68bc8c8feaf00dea09bd33ba71fdcd2539e61f2e Mon Sep 17 00:00:00 2001
From: Yang Shuan <yangshuan45@gmail.com>
Date: Thu, 8 Aug 2019 11:22:37 +0800
Subject: [PATCH] fix(hash): parameters should be placed before hash(#2876)

---
 src/history/hash.js         | 2 +-
 test/e2e/specs/hash-mode.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/history/hash.js b/src/history/hash.js
index 210fae6a2..ac5ef2439 100644
--- a/src/history/hash.js
+++ b/src/history/hash.js
@@ -142,7 +142,7 @@ function getUrl (path) {
   const query = searchPos > -1 ? base.slice(searchPos) : ''
   base = query ? base.slice(0, searchPos) : base
 
-  return `${base}#${path + query}`
+  return `${base}${query}#${path}`
 }
 
 function pushHash (path) {
diff --git a/test/e2e/specs/hash-mode.js b/test/e2e/specs/hash-mode.js
index 6ca546214..b389a9fd5 100644
--- a/test/e2e/specs/hash-mode.js
+++ b/test/e2e/specs/hash-mode.js
@@ -62,13 +62,13 @@ module.exports = {
       // https://github.com/vuejs/vue-router/issues/2125
       .url('http://localhost:8080/hash-mode/?key=foo')
       .waitForElementVisible('#app', 1000)
-      .assert.urlEquals('http://localhost:8080/hash-mode/#/?key=foo')
+      .assert.urlEquals('http://localhost:8080/hash-mode/?key=foo#/')
       .url('http://localhost:8080/hash-mode?key=foo')
       .waitForElementVisible('#app', 1000)
-      .assert.urlEquals('http://localhost:8080/hash-mode/#/?key=foo')
+      .assert.urlEquals('http://localhost:8080/hash-mode/?key=foo#/')
       .url('http://localhost:8080/hash-mode?key=foo#other')
       .waitForElementVisible('#app', 1000)
-      .assert.urlEquals('http://localhost:8080/hash-mode/#/other?key=foo')
+      .assert.urlEquals('http://localhost:8080/hash-mode/?key=foo#/other')
       .end()
   }
 }