fix: 整理页面路径

src/components/TeamPopup/TeamPopup.vue

@@ -56,10 +56,11 @@
 
 <script setup lang="ts">
   import { useBasicStore } from '@/store'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
   const show = ref<boolean>(false)
 
   onMounted(async () => {

src/components/TopNavigation/TopNavigation.vue

@@ -48,10 +48,11 @@
 
 <script lang="ts" setup>
   import { useBasicStore } from '@/store'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
 
   defineProps({
     mini: {

src/pages.json

@@ -50,14 +50,6 @@
     ]
   },
   "pages": [
-    {
-      "path": "pages/mine/mine",
-      "type": "home",
-      "style": {
-        "navigationStyle": "custom",
-        "navigationBarTitleText": "首页"
-      }
-    },
     {
       "path": "pages/home/home",
       "type": "home",
@@ -67,10 +59,6 @@
         "disableScroll": true
       }
     },
-    {
-      "path": "pages/application-list/application-list",
-      "type": "page"
-    },
     {
       "path": "pages/approval/approval-detail",
       "type": "page",
@@ -160,30 +148,8 @@
       }
     },
     {
-      "path": "pages/code/code",
+      "path": "pages/home/application-list",
-      "type": "page",
+      "type": "page"
-      "style": {
-        "navigationStyle": "custom",
-        "disableScroll": true
-      },
-      "needLogin": false
-    },
-    {
-      "path": "pages/get-code/get-code",
-      "type": "page",
-      "style": {
-        "navigationStyle": "custom",
-        "disableScroll": true
-      },
-      "needLogin": false
-    },
-    {
-      "path": "pages/info-publish/add-release-plan",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationStyle": "custom"
-      }
     },
     {
       "path": "pages/info-publish/announce-notice",
@@ -209,29 +175,9 @@
         "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",
@@ -250,20 +196,22 @@
       }
     },
     {
-      "path": "pages/info-publish/play-content-library",
+      "path": "pages/login/code",
       "type": "page",
-      "layout": "default",
       "style": {
-        "navigationStyle": "custom"
+        "navigationStyle": "custom",
-      }
+        "disableScroll": true
+      },
+      "needLogin": false
     },
     {
-      "path": "pages/info-publish/release-plan",
+      "path": "pages/login/get-code",
       "type": "page",
-      "layout": "default",
       "style": {
-        "navigationStyle": "custom"
+        "navigationStyle": "custom",
-      }
+        "disableScroll": true
+      },
+      "needLogin": false
     },
     {
       "path": "pages/login/login",
@@ -275,19 +223,7 @@
       "needLogin": false
     },
     {
-      "path": "pages/notification/notification",
+      "path": "pages/login/reset-password",
-      "type": "page"
-    },
-    {
-      "path": "pages/personnel-passage/traffic-correlation",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/reset-password/reset-password",
       "type": "page",
       "style": {
         "navigationStyle": "custom",
@@ -295,6 +231,14 @@
       },
       "needLogin": false
     },
+    {
+      "path": "pages/mine/mine",
+      "type": "page"
+    },
+    {
+      "path": "pages/notification/notification",
+      "type": "page"
+    },
     {
       "path": "pages/select-member-or-department/select-member-or-department",
       "type": "page",
@@ -357,4 +301,4 @@
     }
   ],
   "subPackages": []
-}
+}

src/pages/home/compoents/HomeTab.vue

@@ -50,7 +50,7 @@
 
   const clickMenu = () => {
     uni.navigateTo({
-      url: '/pages/application-list/application-list'
+      url: '/pages/home/application-list'
     })
   }
 

src/pages/home/home.vue

@@ -40,7 +40,7 @@
           <HomeSwiper @colorChange="colorChange"></HomeSwiper>
           <HomeBulletin class="my-2"></HomeBulletin>
           <HomeTodo class="my-2"></HomeTodo>
-          <CustomTab :list="featuresList" @clickItem="clickItem"></CustomTab>
+          <CustomTab :list="featuresList"></CustomTab>
           <HomeOpenDoor class="my-2"></HomeOpenDoor>
           <HomeAttendance class="my-2"></HomeAttendance>
           <HomeTeamManager class="my-2"></HomeTeamManager>
@@ -56,25 +56,26 @@
 </template>
 
 <script lang="ts" setup>
-  import CustomTab from '@/pages/home/HomeTab.vue'
+  import CustomTab from '@/pages/home/compoents/HomeTab.vue'
   import { useBasicStore, useUserStore } from '@/store'
   import { Result } from '@/constants/result'
   import { HomeTab } from '@/typings'
-  import HomeSwiper from '@/pages/home/HomeSwiper.vue'
+  import HomeSwiper from '@/pages/home/compoents/HomeSwiper.vue'
-  import HomeBulletin from '@/pages/home/HomeBulletin.vue'
+  import HomeBulletin from '@/pages/home/compoents/HomeBulletin.vue'
-  import HomeTodo from '@/pages/home/HomeTodo.vue'
+  import HomeTodo from '@/pages/home/compoents/HomeTodo.vue'
-  import HomeOpenDoor from '@/pages/home/HomeOpenDoor.vue'
+  import HomeOpenDoor from '@/pages/home/compoents/HomeOpenDoor.vue'
-  import HomeAttendance from '@/pages/home/HomeAttendance.vue'
+  import HomeAttendance from '@/pages/home/compoents/HomeAttendance.vue'
-  import HomeTeamManager from '@/pages/home/HomeTeamManager.vue'
+  import HomeTeamManager from '@/pages/home/compoents/HomeTeamManager.vue'
-  import HomeSetting from '@/pages/home/HomeSetting.vue'
+  import HomeSetting from '@/pages/home/compoents/HomeSetting.vue'
-  import HomeAddDevice from '@/pages/home/HomeAddDevice.vue'
+  import HomeAddDevice from '@/pages/home/compoents/HomeAddDevice.vue'
-  import HomeAddTeamManager from '@/pages/home/HomeAddTeamManager.vue'
+  import HomeAddTeamManager from '@/pages/home/compoents/HomeAddTeamManager.vue'
   import TeamPopup from '@/components/TeamPopup/TeamPopup.vue'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const $user = useUserStore()
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
 
   const color = ref<string>('#bfcbef')
 
@@ -318,11 +319,4 @@
   const colorChange = data => {
     color.value = data
   }
-
-  const clickItem = item => {
-    console.log(item)
-    uni.navigateTo({
-      url: item.url
-    })
-  }
 </script>

src/pages/login/code.vue

@@ -124,7 +124,7 @@
         }
       } else if (type.value === 'reset-password') {
         await uni.redirectTo({
-          url: `/pages/reset-password/reset-password?phone=${phone.value}&code=${code.value}`
+          url: `/pages/login/reset-password?phone=${phone.value}&code=${code.value}`
         })
       }
     }
@@ -159,4 +159,8 @@
     border: #b8b8b8 solid 2rpx;
     border-radius: 12rpx;
   }
+
+  page {
+    background-color: #ffffff;
+  }
 </style>

src/pages/login/get-code.vue

@@ -63,7 +63,7 @@
       uni.hideLoading()
       if (result.errorCode === Result.Success.code) {
         await uni.navigateTo({
-          url: `/pages/reset-password/reset-password?phone=${phone.value}`
+          url: `/pages/login/reset-password?phone=${phone.value}`
         })
       } else {
         await uni.showToast({
@@ -85,3 +85,9 @@
     phone.value = value
   }
 </script>
+
+<style lang="scss">
+  page {
+    background-color: #ffffff;
+  }
+</style>

src/pages/login/login.vue

@@ -61,7 +61,7 @@
               :disabled="!phonePass"
               :round="false"
               size="large"
-              @click="codeLogin"
+              @click="codeLogin(false, $event)"
             >
               获取验证码
             </wd-button>
@@ -264,7 +264,7 @@
       })
       uni.hideLoading()
       if (result.errorCode === Result.Success.code) {
-        let url = `/pages/code/code?phone=${phone.value}&type=login`
+        let url = `/pages/login/code?phone=${phone.value}&type=login`
         if (tip) {
           url = url + `&tip=true`
         }
@@ -298,7 +298,7 @@
       params = `?phone=${phone.value}`
     }
     uni.navigateTo({
-      url: `/pages/get-code/get-code${params}`
+      url: `/pages/login/get-code${params}`
     })
   }
 
@@ -325,3 +325,9 @@
     consentAgreement.value = !consentAgreement.value
   }
 </script>
+
+<style lang="scss">
+  page {
+    background-color: #ffffff;
+  }
+</style>

src/pages/login/reset-password.vue

@@ -226,4 +226,8 @@
   }
 </script>
 
-<style scoped lang="scss"></style>
+<style lang="scss">
+  page {
+    background-color: #ffffff;
+  }
+</style>

src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue

@@ -16,11 +16,11 @@
     <view class="ml-2 break-all max-w-40 overflow-hidden text-ellipsis line-clamp-1">
       {{ item.name }}
     </view>
-    <view class="ml-a" v-if="item.type === 'department'">
+    <view class="ml-a" v-if="item.type !== 'member'">
       <wd-divider vertical></wd-divider>
     </view>
     <view
-      v-if="item.type === 'department'"
+      v-if="item.type !== 'member'"
       :class="[disabled ? 'color-#87a9fb' : 'custom-color-blue']"
       class="ml-1"
     >
@@ -31,7 +31,7 @@
       size="14px"
       class="ml-2"
       :color="disabled ? '#87a9fb' : '#255cf7'"
-      v-if="item.type === 'department'"
+      v-if="item.type !== 'member'"
     ></wd-icon>
   </view>
 </template>

src/pages/select-member-or-department/select-member-or-department.vue

@@ -148,6 +148,7 @@
   import { useBasicStore } from '@/store'
   import MemberOrDepartmentItem from '@/pages/select-member-or-department/components/MemberOrDepartmentItem.vue'
   import SearchItem from '@/pages/select-member-or-department/components/SearchItem.vue'
+  import GetSystemInfoResult = UniNamespace.GetSystemInfoResult
 
   const instance = getCurrentInstance().proxy
   const eventChannel = instance.getOpenerEventChannel()
@@ -167,7 +168,7 @@
 
   const $basic = useBasicStore()
 
-  const systemInfo = ref(null)
+  const systemInfo = ref<GetSystemInfoResult>(null)
 
   const value = ref<Array>([])
   const showSelected = ref<boolean>(false)

src/types/uni-pages.d.ts

@@ -4,9 +4,7 @@
 // Generated by vite-plugin-uni-pages
 
 interface NavigateToOptions {
-  url: "/pages/mine/mine" |
+  url: "/pages/home/home" |
-       "/pages/home/home" |
-       "/pages/application-list/application-list" |
        "/pages/approval/approval-detail" |
        "/pages/approval/approval" |
        "/pages/approval/create-application" |
@@ -18,23 +16,19 @@ interface NavigateToOptions {
        "/pages/attendance/flexible-punching" |
        "/pages/attendance/issue-record-detail" |
        "/pages/attendance/issue-record" |
-       "/pages/code/code" |
+       "/pages/home/application-list" |
-       "/pages/get-code/get-code" |
-       "/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/login/code" |
-       "/pages/info-publish/release-plan" |
+       "/pages/login/get-code" |
        "/pages/login/login" |
+       "/pages/login/reset-password" |
+       "/pages/mine/mine" |
        "/pages/notification/notification" |
-       "/pages/personnel-passage/traffic-correlation" |
-       "/pages/reset-password/reset-password" |
        "/pages/select-member-or-department/select-member-or-department" |
        "/pages/workbench/workbench" |
        "/pages/attendance/attendance-add-group/attendance-add-group" |