From 9977056d504185e028a34500e001321100c88996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Fri, 13 Dec 2019 11:23:14 +0800
Subject: [PATCH] fix(cli): nav route matching

---
 .../vant-cli/site/desktop/components/Nav.vue  |  2 +-
 .../site/desktop/components/NavLink.vue       |  3 +-
 packages/vant-cli/site/desktop/router.js      | 29 +++++++++++++------
 packages/vant-cli/site/mobile/router.js       |  2 +-
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/packages/vant-cli/site/desktop/components/Nav.vue b/packages/vant-cli/site/desktop/components/Nav.vue
index ebac7741f..83fcdf13e 100644
--- a/packages/vant-cli/site/desktop/components/Nav.vue
+++ b/packages/vant-cli/site/desktop/components/Nav.vue
@@ -52,7 +52,7 @@ export default {
     },
 
     base() {
-      return this.lang ? `/${this.lang}` : '';
+      return this.lang ? `/${this.lang}/` : '/';
     }
   },
 
diff --git a/packages/vant-cli/site/desktop/components/NavLink.vue b/packages/vant-cli/site/desktop/components/NavLink.vue
index baf1cf748..ebc017eb6 100644
--- a/packages/vant-cli/site/desktop/components/NavLink.vue
+++ b/packages/vant-cli/site/desktop/components/NavLink.vue
@@ -20,8 +20,7 @@ export default {
     },
 
     path() {
-      const { path } = this.item;
-      return this.base ? `${this.base}/${path}` : path;
+      return `${this.base}${this.item.path}`;
     },
 
     active() {
diff --git a/packages/vant-cli/site/desktop/router.js b/packages/vant-cli/site/desktop/router.js
index 1e135179a..3f9e44d13 100644
--- a/packages/vant-cli/site/desktop/router.js
+++ b/packages/vant-cli/site/desktop/router.js
@@ -74,15 +74,26 @@ function getRoutes() {
       addHomeRoute(documents[name], lang);
     }
 
-    routes.push({
-      name: `${lang}/${component}`,
-      path: `/${lang}/${component}`,
-      component: documents[name],
-      meta: {
-        lang,
-        name: component
-      }
-    });
+    if (lang) {
+      routes.push({
+        name: `${lang}/${component}`,
+        path: `/${lang}/${component}`,
+        component: documents[name],
+        meta: {
+          lang,
+          name: component
+        }
+      });
+    } else {
+      routes.push({
+        name: `${component}`,
+        path: `/${component}`,
+        component: documents[name],
+        meta: {
+          name: component
+        }
+      });
+    }
   });
 
   return routes;
diff --git a/packages/vant-cli/site/mobile/router.js b/packages/vant-cli/site/mobile/router.js
index 3635b782a..05e1fe0e2 100644
--- a/packages/vant-cli/site/mobile/router.js
+++ b/packages/vant-cli/site/mobile/router.js
@@ -46,7 +46,7 @@ function getRoutes() {
     });
 
     routes.push({
-      path: '',
+      path: '/',
       component: DemoHome
     });
   }