fix: 合并代码

src/pages.json

@@ -151,6 +151,14 @@
       "path": "pages/home/application-list",
       "type": "page"
     },
+    {
+      "path": "pages/info-publish/add-release-plan",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/info-publish/announce-notice",
       "type": "page",
@@ -175,9 +183,29 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/info-publish/edit-pic-video",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/info-publish/info-publish",
-      "type": "page"
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/info-publish/material-library",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
     },
     {
       "path": "pages/info-publish/notice-details",
@@ -195,6 +223,22 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/info-publish/play-content-library",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/info-publish/release-plan",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/login/code",
       "type": "page",
@@ -233,12 +277,24 @@
     },
     {
       "path": "pages/mine/mine",
-      "type": "page"
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "首页"
+      }
     },
     {
       "path": "pages/notification/notification",
       "type": "page"
     },
+    {
+      "path": "pages/personnel-passage/traffic-correlation",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/select/select-access-control",
       "type": "page",
@@ -309,4 +365,4 @@
     }
   ],
   "subPackages": []
-}
+}

src/pages/approval/create-application.vue

@@ -10,8 +10,8 @@
   <view class="h-100vh flex flex-col">
     <TopNavigation :title="title"></TopNavigation>
     <scroll-view class="flex-1 box-border" :scroll-y="true">
-      <ApprovalCreate></ApprovalCreate>
       <Form></Form>
+      <ApprovalCreate></ApprovalCreate>
     </scroll-view>
     <view class="pb-safe border-#eef0f5 border-t-solid">
       <view class="flex flex-items-center flex-justify-around py-3 px-3">

src/pages/mine/mine.vue

@@ -1,4 +1,4 @@
-<route lang="json5" type="home">
+<route lang="json5">
 {
   style: {
     navigationStyle: 'custom',

src/types/uni-pages.d.ts

@@ -17,18 +17,24 @@ interface NavigateToOptions {
        "/pages/attendance/issue-record-detail" |
        "/pages/attendance/issue-record" |
        "/pages/home/application-list" |
+       "/pages/info-publish/add-release-plan" |
        "/pages/info-publish/announce-notice" |
        "/pages/info-publish/basic-info" |
        "/pages/info-publish/drafts-list" |
+       "/pages/info-publish/edit-pic-video" |
        "/pages/info-publish/info-publish" |
+       "/pages/info-publish/material-library" |
        "/pages/info-publish/notice-details" |
        "/pages/info-publish/notice-manage" |
+       "/pages/info-publish/play-content-library" |
+       "/pages/info-publish/release-plan" |
        "/pages/login/code" |
        "/pages/login/get-code" |
        "/pages/login/login" |
        "/pages/login/reset-password" |
        "/pages/mine/mine" |
        "/pages/notification/notification" |
+       "/pages/personnel-passage/traffic-correlation" |
        "/pages/select/select-access-control" |
        "/pages/select/select-organization" |
        "/pages/workbench/workbench" |