From 36360a8e0f40e1e02a14a3878527d9438a049087 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Thu, 11 Aug 2022 19:45:17 +0800
Subject: [PATCH] fix(h5): fullPath

---
 packages/uni-h5/dist/uni-h5.cjs.js          | 6 +++++-
 packages/uni-h5/dist/uni-h5.es.js           | 6 +++++-
 packages/uni-h5/src/framework/setup/page.ts | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js
index 193004aef..011fd4759 100644
--- a/packages/uni-h5/dist/uni-h5.cjs.js
+++ b/packages/uni-h5/dist/uni-h5.cjs.js
@@ -6917,7 +6917,11 @@ function initPublicPage(route) {
   if (!__UNI_FEATURE_PAGES__) {
     return initPageInternalInstance("navigateTo", __uniRoutes[0].path, {}, meta);
   }
-  return initPageInternalInstance("navigateTo", route.fullPath, {}, meta);
+  let fullPath = route.fullPath;
+  if (route.meta.isEntry) {
+    fullPath = "/" + route.meta.route + fullPath.replace("/", "");
+  }
+  return initPageInternalInstance("navigateTo", fullPath, {}, meta);
 }
 function initPage(vm) {
   const route = vm.$route;
diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js
index ce434fbd8..f5667850c 100644
--- a/packages/uni-h5/dist/uni-h5.es.js
+++ b/packages/uni-h5/dist/uni-h5.es.js
@@ -14066,7 +14066,11 @@ function initPublicPage(route) {
   if (!__UNI_FEATURE_PAGES__) {
     return initPageInternalInstance("navigateTo", __uniRoutes[0].path, {}, meta);
   }
-  return initPageInternalInstance("navigateTo", route.fullPath, {}, meta);
+  let fullPath = route.fullPath;
+  if (route.meta.isEntry) {
+    fullPath = "/" + route.meta.route + fullPath.replace("/", "");
+  }
+  return initPageInternalInstance("navigateTo", fullPath, {}, meta);
 }
 function initPage(vm) {
   const route = vm.$route;
diff --git a/packages/uni-h5/src/framework/setup/page.ts b/packages/uni-h5/src/framework/setup/page.ts
index 1a545de15..9095d635f 100644
--- a/packages/uni-h5/src/framework/setup/page.ts
+++ b/packages/uni-h5/src/framework/setup/page.ts
@@ -88,7 +88,11 @@ function initPublicPage(route: RouteLocationNormalizedLoaded) {
   if (!__UNI_FEATURE_PAGES__) {
     return initPageInternalInstance('navigateTo', __uniRoutes[0].path, {}, meta)
   }
-  return initPageInternalInstance('navigateTo', route.fullPath, {}, meta)
+  let fullPath = route.fullPath
+  if (route.meta.isEntry) {
+    fullPath = '/' + route.meta.route + fullPath.replace('/', '')
+  }
+  return initPageInternalInstance('navigateTo', fullPath, {}, meta)
 }
 
 export function initPage(vm: ComponentPublicInstance) {
-- 
GitLab