Merge branch 'next' into fix/alipay-input

NervJS · Jan 28, 2021 · 08bbfd5 · 08bbfd5
2 parents e08341e + 2b05425
commit 08bbfd5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/packages/taro-runtime/src/dsl/common.ts b/packages/taro-runtime/src/dsl/common.ts
@@ -106,10 +106,10 @@ export function createPageConfig (component: any, pageName?: string, data?: Reco
       }
 
       const path = getPath(id, options)
-
+      const router = isBrowser ? path : this.route || this.__route__
       Current.router = {
         params: options,
-        path: addLeadingSlash(this.route || this.__route__),
+        path: addLeadingSlash(router),
         onReady: getOnReadyEventKey(id),
         onShow: getOnShowEventKey(id),
         onHide: getOnHideEventKey(id)
@@ -161,10 +161,10 @@ export function createPageConfig (component: any, pageName?: string, data?: Reco
       Current.page = this as any
       this.config = pageConfig || {}
       const path = getPath(id, this.options)
-
+      const router = isBrowser ? path : this.route || this.__route__
       Current.router = {
         params: this.options,
-        path: addLeadingSlash(this.route || this.__route__),
+        path: addLeadingSlash(router),
         onReady: getOnReadyEventKey(id),
         onShow: getOnShowEventKey(id),
         onHide: getOnHideEventKey(id)