fix query double encoding (fix #378)

Author: yyx990803

src/index.js

@@ -304,7 +304,7 @@ class Router {
    */
 
   stringifyPath (path) {
-    let fullPath = ''
+    let generatedPath = ''
     if (path && typeof path === 'object') {
       if (path.name) {
         const extend = Vue.util.extend
@@ -315,26 +315,23 @@ class Router {
         const params = currentParams
           ? extend(extend({}, currentParams), targetParams)
           : targetParams
-        if (path.query) {
-          params.queryParams = path.query
-        }
-        fullPath = encodeURI(this._recognizer.generate(path.name, params))
+        generatedPath = encodeURI(this._recognizer.generate(path.name, params))
       } else if (path.path) {
-        fullPath = path.path
-        if (path.query) {
-          const query = this._recognizer.generateQueryString(path.query)
-          if (fullPath.indexOf('?') > -1) {
-            fullPath += '&' + query.slice(1)
-          } else {
-            fullPath += query
-          }
+        generatedPath = encodeURI(path.path)
+      }
+      if (path.query) {
+        // note: the generated query string is pre-URL-encoded by the recognizer
+        const query = this._recognizer.generateQueryString(path.query)
+        if (generatedPath.indexOf('?') > -1) {
+          generatedPath += '&' + query.slice(1)
+        } else {
+          generatedPath += query
         }
-        fullPath = encodeURI(fullPath)
       }
     } else {
-      fullPath = encodeURI(path ? path + '' : '')
+      generatedPath = encodeURI(path ? path + '' : '')
     }
-    return fullPath
+    return generatedPath
   }
 
   // Internal methods ======================================

test/unit/specs/core.js

@@ -1152,9 +1152,10 @@ describe('Stringify Path', function () {
 
   it('object path', function () {
     expect(router.stringifyPath({ path: '/hi' })).toBe('/hi')
-    expect(router.stringifyPath({ path: '/hi', query: { a: 1 } })).toBe('/hi?a=1')
-    expect(router.stringifyPath({ path: '/hi', query: { a: 1, b: 2 } })).toBe('/hi?a=1&b=2')
-    expect(router.stringifyPath({ path: '/hi?c=3', query: { a: 1, b: 2 } })).toBe('/hi?c=3&a=1&b=2')
+    expect(router.stringifyPath({ path: '/hi', query: { a: 1 }})).toBe('/hi?a=1')
+    expect(router.stringifyPath({ path: '/hi', query: { a: 1, b: 2 }})).toBe('/hi?a=1&b=2')
+    expect(router.stringifyPath({ path: '/hi?c=3', query: { a: 1, b: 2 }})).toBe('/hi?c=3&a=1&b=2')
+    expect(router.stringifyPath({ path: '/hi', query: { a: '/c' }})).toBe('/hi?a=%2Fc')
   })
 
   it('named route', function () {
@@ -1165,8 +1166,10 @@ describe('Stringify Path', function () {
       }
     })
     expect(router.stringifyPath({ name: 'a' })).toBe('/test/:id')
-    expect(router.stringifyPath({ name: 'a', params: { id: 0 } })).toBe('/test/0')
-    expect(router.stringifyPath({ name: 'a', params: { id: 'hi' } })).toBe('/test/hi')
+    expect(router.stringifyPath({ name: 'a', params: { id: 0 }})).toBe('/test/0')
+    expect(router.stringifyPath({ name: 'a', params: { id: 'hi' }})).toBe('/test/hi')
+    expect(router.stringifyPath({ name: 'a', params: { id: '你好' }})).toBe('/test/' + encodeURIComponent('你好'))
+    expect(router.stringifyPath({ name: 'a', params: { id: 'hi' }, query: { b: '/c' }})).toBe('/test/hi?b=%2Fc')
   })
 
   it('named route not found should throw error', function () {