From 372e8a915f7703c8a6c9c41c94686ce06c340b30 Mon Sep 17 00:00:00 2001
From: hdx <hdx@dcloud.io>
Date: Tue, 15 Aug 2023 14:08:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E<navigator>=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E7=A4=BA=E4=BE=8B,=20=E6=9A=82=E4=B8=8D=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=86=85=E5=B5=8Cbutton=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                               | 18 +++++++++++
 pages/component/navigator/navigate.uvue  | 15 +++++++++
 pages/component/navigator/navigator.uvue | 39 ++++++++++++++++++++++++
 pages/component/navigator/redirect.uvue  | 15 +++++++++
 pages/tabBar/component.uvue              | 17 ++++++-----
 5 files changed, 96 insertions(+), 8 deletions(-)
 create mode 100644 pages/component/navigator/navigate.uvue
 create mode 100644 pages/component/navigator/navigator.uvue
 create mode 100644 pages/component/navigator/redirect.uvue

diff --git a/pages.json b/pages.json
index f77f0381..e5e3c749 100644
--- a/pages.json
+++ b/pages.json
@@ -146,6 +146,24 @@
         "navigationBarTitleText": "web-view-local"
       }
     },
+    {
+      "path": "pages/component/navigator/navigator",
+      "style": {
+        "navigationBarTitleText": "navigator"
+      }
+    },
+    {
+      "path": "pages/component/navigator/navigate",
+      "style": {
+        "navigationBarTitleText": "navigatePage"
+      }
+    },
+    {
+      "path": "pages/component/navigator/redirect",
+      "style": {
+        "navigationBarTitleText": "redirectPage"
+      }
+    },
     {
       "path": "pages/tabBar/API",
       "style": {
diff --git a/pages/component/navigator/navigate.uvue b/pages/component/navigator/navigate.uvue
new file mode 100644
index 00000000..75458979
--- /dev/null
+++ b/pages/component/navigator/navigate.uvue
@@ -0,0 +1,15 @@
+<template>
+  <view>
+    <page-head :title="title"></page-head>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        title: '新建的页面'
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/pages/component/navigator/navigator.uvue b/pages/component/navigator/navigator.uvue
new file mode 100644
index 00000000..5b312f55
--- /dev/null
+++ b/pages/component/navigator/navigator.uvue
@@ -0,0 +1,39 @@
+<template>
+  <view>
+    <page-head :title="title"></page-head>
+    <view class="uni-padding-wrap uni-common-mt">
+      <!-- TODO 暂不支持嵌入button组件 -->
+      <navigator class="navigator" url="navigate?title=navigate">
+        <!-- <button type="default">跳转到新页面</button> -->
+        <text class="btn">跳转到新页面</text>
+      </navigator>
+      <navigator class="navigator" url="redirect?title=redirect" open-type="redirect">
+        <!-- <button type="default">在当前页打开</button> -->
+        <text class="btn">在当前页打开</text>
+      </navigator>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        title: 'navigator'
+      }
+    }
+  }
+</script>
+
+<style>
+  .navigator {
+    margin-top: 15px;
+  }
+
+  .btn {
+    padding: 12px 5px;
+    text-align: center;
+    border: 1px solid #dbdbdb;
+    border-radius: 5px;
+  }
+</style>
\ No newline at end of file
diff --git a/pages/component/navigator/redirect.uvue b/pages/component/navigator/redirect.uvue
new file mode 100644
index 00000000..42c5f199
--- /dev/null
+++ b/pages/component/navigator/redirect.uvue
@@ -0,0 +1,15 @@
+<template>
+  <view>
+    <page-head :title="title"></page-head>
+  </view>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        title: '当前页'
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/pages/tabBar/component.uvue b/pages/tabBar/component.uvue
index 0bfcc212..5ba6339c 100644
--- a/pages/tabBar/component.uvue
+++ b/pages/tabBar/component.uvue
@@ -181,14 +181,15 @@ export default {
               },
               */
           ] as Page[],
-          /* }, {
-              id: 'nav',
-              name: '导航',
-              open: false,
-              pages: [{
-                name: 'navigator',
-                enable: false
-              }] as Page[] */
+        },
+        {
+            id: 'nav',
+            name: '导航',
+            open: false,
+            pages: [{
+              name: 'navigator',
+              enable: true
+            }] as Page[],
         },
         {
           id: 'media',
-- 
GitLab