From d05dae4cbf82af753029f55931e36765d2e7f6e8 Mon Sep 17 00:00:00 2001
From: Burt <1020103647@qq.com>
Date: Mon, 8 Jan 2024 21:28:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B4=E7=90=86=E9=80=9A=E5=B1=8F?=
 =?UTF-8?q?=E9=A1=B5=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                | 34 +++++++++----------
 .../index.vue => index/demo/throughout.vue}   |  0
 src/pages/index/index.vue                     |  2 +-
 src/pages/throughout/index.vue                |  6 +++-
 uni-pages.d.ts                                |  2 +-
 5 files changed, 24 insertions(+), 20 deletions(-)
 rename src/pages/{throughout2/index.vue => index/demo/throughout.vue} (100%)

diff --git a/src/pages.json b/src/pages.json
index 5cfd52a..64f0c07 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -73,23 +73,6 @@
         }
       }
     },
-    {
-      "path": "pages/throughout2/index",
-      "type": "page",
-      "style": {
-        "navigationBarTitleText": "通屏+下拉刷新+自定义导航栏",
-        "enablePullDownRefresh": false,
-        "backgroundColor": "#23c09c",
-        "app-plus": {
-          "titleNView": {
-            "type": "transparent"
-          }
-        },
-        "mp-weixin": {
-          "navigationStyle": "custom"
-        }
-      }
-    },
     {
       "path": "pages/index/demo/component-auto-import",
       "type": "page"
@@ -117,6 +100,23 @@
       "path": "pages/index/demo/request",
       "type": "page"
     },
+    {
+      "path": "pages/index/demo/throughout",
+      "type": "page",
+      "style": {
+        "navigationBarTitleText": "通屏+下拉刷新+自定义导航栏",
+        "enablePullDownRefresh": false,
+        "backgroundColor": "#23c09c",
+        "app-plus": {
+          "titleNView": {
+            "type": "transparent"
+          }
+        },
+        "mp-weixin": {
+          "navigationStyle": "custom"
+        }
+      }
+    },
     {
       "path": "pages/index/demo/uni-ui-icons",
       "type": "page"
diff --git a/src/pages/throughout2/index.vue b/src/pages/index/demo/throughout.vue
similarity index 100%
rename from src/pages/throughout2/index.vue
rename to src/pages/index/demo/throughout.vue
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 292debc..97853b2 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -60,7 +60,7 @@ const list = ref([
   },
   {
     name: '自定义导航栏渐变',
-    url: 'navbar-plus',
+    url: 'throughout',
   },
   {
     name: '请求封装+请求拦截器',
diff --git a/src/pages/throughout/index.vue b/src/pages/throughout/index.vue
index b4d617f..bad4f22 100644
--- a/src/pages/throughout/index.vue
+++ b/src/pages/throughout/index.vue
@@ -57,7 +57,11 @@
       onPageScroll 实现全端效果一样，另外如果是app端，还可以配置 titleNView。参考
       https://uniapp.dcloud.net.cn/tutorial/page.html#onpagescroll 。
     </view>
-    <navigator url="/pages/throughout2/index" open-type="navigate" hover-class="navigator-hover">
+    <navigator
+      url="/pages/index/demo/throughout"
+      open-type="navigate"
+      hover-class="navigator-hover"
+    >
       <button>去二级详情页</button>
     </navigator>
     <view class="bg-white">
diff --git a/uni-pages.d.ts b/uni-pages.d.ts
index c8f462f..93b0ea6 100644
--- a/uni-pages.d.ts
+++ b/uni-pages.d.ts
@@ -8,13 +8,13 @@ interface NavigateToOptions {
        "pages/demo/index" |
        "pages/my/index" |
        "pages/throughout/index" |
-       "pages/throughout2/index" |
        "pages/index/demo/component-auto-import" |
        "pages/index/demo/mp-weixin-share" |
        "pages/index/demo/navbar" |
        "pages/index/demo/pages-auto-import" |
        "pages/index/demo/pinia" |
        "pages/index/demo/request" |
+       "pages/index/demo/throughout" |
        "pages/index/demo/uni-ui-icons" |
        "pages/index/demo/uni-ui" |
        "pages/index/demo/unocss-icons" |