From 03b8b0c2b049a38cce5928673437c43a7baf76e8 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Thu, 21 Aug 2025 20:22:46 +0800
Subject: [PATCH] =?UTF-8?q?refactor(router):=20=E7=BB=9F=E4=B8=80=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=20parseUrlToObj=20=E6=9B=BF=E6=8D=A2=20parseRouteStr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将路由解析功能从 queryString.ts 迁移到 utils/index.ts 并重命名为 parseUrlToObj
删除不再使用的 queryString.ts 文件
---
 src/pages/login/login.vue |  4 ++--
 src/router/interceptor.ts |  5 ++---
 src/router/queryString.ts | 42 ---------------------------------------
 src/utils/index.ts        |  4 ++--
 4 files changed, 6 insertions(+), 49 deletions(-)
 delete mode 100644 src/router/queryString.ts

diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index de22356..b344a34 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -8,11 +8,11 @@
 </route>
 
 <script lang="ts" setup>
-import { parseRouteStr } from '@/router/queryString'
 import { useUserStore } from '@/store/user'
 import { tabbarList } from '@/tabbar/config'
 import { isPageTabbar } from '@/tabbar/store'
 import { ensureDecodeURIComponent } from '@/utils'
+import { parseUrlToObj } from '@/utils/index'
 
 const redirectUrl = ref('')
 onLoad((options) => {
@@ -39,7 +39,7 @@ function doLogin() {
   if (!path.startsWith('/')) {
     path = `/${path}`
   }
-  const { path: _path, query } = parseRouteStr(path)
+  const { path: _path, query } = parseUrlToObj(path)
   console.log('_path:', _path, 'query:', query, 'path:', path)
   console.log('isPageTabbar(_path):', isPageTabbar(_path))
   if (isPageTabbar(_path)) {
diff --git a/src/router/interceptor.ts b/src/router/interceptor.ts
index cfd7110..77f5e2e 100644
--- a/src/router/interceptor.ts
+++ b/src/router/interceptor.ts
@@ -6,9 +6,8 @@
  */
 import { useUserStore } from '@/store'
 import { tabbarStore } from '@/tabbar/store'
-import { getLastPage } from '@/utils'
+import { getLastPage, parseUrlToObj } from '@/utils/index'
 import { EXCLUDE_PAGE_LIST, isNeedLogin, LOGIN_PAGE, LOGIN_PAGE_LIST } from '../login/config'
-import { parseRouteStr } from './queryString'
 
 // 黑名单登录拦截器 - （适用于大部分页面不需要登录，少部分页面需要登录）
 export const navigateToInterceptor = {
@@ -18,7 +17,7 @@ export const navigateToInterceptor = {
     if (url === undefined) {
       return
     }
-    let { path, query: _query } = parseRouteStr(url)
+    let { path, query: _query } = parseUrlToObj(url)
 
     console.log('路由拦截器 1: url->', url, ', query ->', query)
     const myQuery = { ..._query, ...query }
diff --git a/src/router/queryString.ts b/src/router/queryString.ts
deleted file mode 100644
index 20ffec1..0000000
--- a/src/router/queryString.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * 把一个带查询参数的路由字符串解析为对象
- * @param query 要解析的查询字符串
- * @returns 解析后的对象
- */
-export function parseQuery(query: string): Record<string, any> {
-  if (!query)
-    return {}
-
-  // 处理 ? 前缀
-  if (query.startsWith('?'))
-    query = query.slice(1)
-
-  return query.split('&').reduce((acc, cur) => {
-    const [key, value] = cur.split('=')
-    acc[key] = decodeURIComponent(value)
-    return acc
-  }, {} as Record<string, any>)
-}
-
-export function parseRouteStr(routeStr: string): Record<string, any> {
-  if (!routeStr)
-    return {}
-
-  if (!routeStr.includes('?')) {
-    return {
-      path: routeStr,
-    }
-  }
-
-  const [path, query] = routeStr.split('?')
-  if (query) {
-    return {
-      path,
-      query: parseQuery(query),
-    }
-  }
-
-  return {
-    path,
-  }
-}
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 9ef3987..a4a994b 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -27,7 +27,7 @@ export function currRoute() {
   // console.log(fullPath)
   // eg: /pages/login/login?redirect=%2Fpages%2Fdemo%2Fbase%2Froute-interceptor (小程序)
   // eg: /pages/login/login?redirect=%2Fpages%2Froute-interceptor%2Findex%3Fname%3Dfeige%26age%3D30(h5)
-  return getUrlObj(fullPath)
+  return parseUrlToObj(fullPath)
 }
 
 export function ensureDecodeURIComponent(url: string) {
@@ -41,7 +41,7 @@ export function ensureDecodeURIComponent(url: string) {
  * 比如输入url: /pages/login/login?redirect=%2Fpages%2Fdemo%2Fbase%2Froute-interceptor
  * 输出: {path: /pages/login/login, query: {redirect: /pages/demo/base/route-interceptor}}
  */
-export function getUrlObj(url: string) {
+export function parseUrlToObj(url: string) {
   const [path, queryStr] = url.split('?')
   // console.log(path, queryStr)