From 13c166139dcc39f9faf5664e17c3abe8ed5683fa Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Wed, 4 Jun 2025 09:00:34 +0800
Subject: [PATCH 1/6] =?UTF-8?q?Revert=20"style:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E6=A0=B7=E5=BC=8F=E5=B9=B6=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=A3=80=E6=9F=A5=E8=AD=A6=E5=91=8A"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a5a359528a4f2183bd3110dc288c140485345bbe.
---
 src/App.vue | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b474aee..d32c900 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,3 +1,59 @@
-import { onLaunch, onShow, onHide } from '@dcloudio/uni-app' import
-'abortcontroller-polyfill/dist/abortcontroller-polyfill-only' onLaunch(() => { console.log('App
-Launch') }) onShow(() => { console.log('App Show') }) onHide(() => { console.log('App Hide') })
+<script setup lang="ts">
+import { onLaunch, onShow, onHide } from '@dcloudio/uni-app'
+import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only'
+
+onLaunch(() => {
+  console.log('App Launch')
+})
+onShow(() => {
+  console.log('App Show')
+})
+onHide(() => {
+  console.log('App Hide')
+})
+</script>
+
+<style lang="scss">
+/* stylelint-disable selector-type-no-unknown */
+button::after {
+  border: none;
+}
+
+swiper,
+scroll-view {
+  flex: 1;
+  height: 100%;
+  overflow: hidden;
+}
+
+image {
+  width: 100%;
+  height: 100%;
+  vertical-align: middle;
+}
+
+// 单行省略，优先使用 unocss: text-ellipsis
+.ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+// 两行省略
+.ellipsis-2 {
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+
+// 三行省略
+.ellipsis-3 {
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
+}
+</style>

From 0b4147a15e6c9e1111c48d31dfc74e6278dade46 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Wed, 4 Jun 2025 09:02:49 +0800
Subject: [PATCH 2/6] =?UTF-8?q?style:=20=E6=9B=B4=E6=96=B0lint-staged?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BB=A5=E6=94=AF=E6=8C=81Vue=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c7046a7..df0d08b 100644
--- a/package.json
+++ b/package.json
@@ -73,10 +73,10 @@
     "prepare": "git init && husky"
   },
   "lint-staged": {
-    "**/*.{html,cjs,json,md,scss,css,txt}": [
+    "**/*.{vue,html,cjs,json,md,scss,css,txt}": [
       "prettier --write --cache"
     ],
-    "**/*.{vue,js,ts}": [
+    "**/*.{js,ts}": [
       "oxlint --fix",
       "prettier --write --cache"
     ],

From f23d8128f93c1167f337f0c46a1121fd49ec6ee0 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Wed, 4 Jun 2025 09:03:13 +0800
Subject: [PATCH 3/6] =?UTF-8?q?test:=20=E6=B5=8B=E8=AF=95=20lint-staged?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index d32c900..8cec5a2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,7 +14,6 @@ onHide(() => {
 </script>
 
 <style lang="scss">
-/* stylelint-disable selector-type-no-unknown */
 button::after {
   border: none;
 }

From dcae738e698314d9e9e564abfcfc3f639023917f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=89=91=E6=9C=AF?= <864822121@qq.com>
Date: Wed, 4 Jun 2025 12:25:13 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2URL=E9=85=8D=E7=BD=AE=E5=8F=8A?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在.env文件中新增VITE_LOGIN_URL配置
- 在App.vue中引入并调用usePageAuth以实现页面权限控制
- 更新route.ts以使用环境变量中的登录页面URL
---
 env/.env                  |  3 +++
 src/App.vue               |  3 +++
 src/hooks/usePageAuth.ts  | 48 +++++++++++++++++++++++++++++++++++++++
 src/interceptors/route.ts |  2 +-
 4 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 src/hooks/usePageAuth.ts

diff --git a/env/.env b/env/.env
index e638295..05c8a58 100644
--- a/env/.env
+++ b/env/.env
@@ -7,6 +7,9 @@ VITE_WX_APPID = 'wxa2abb91f64032a2b'
 # h5部署网站的base，配置到 manifest.config.ts 里的 h5.router.base
 VITE_APP_PUBLIC_BASE=/
 
+# 登录页面
+VITE_LOGIN_URL = '/pages/login/index'
+
 VITE_SERVER_BASEURL = 'https://ukw0y1.laf.run'
 VITE_UPLOAD_BASEURL = 'https://ukw0y1.laf.run/upload'
 
diff --git a/src/App.vue b/src/App.vue
index 8cec5a2..302878f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,9 @@
 <script setup lang="ts">
 import { onLaunch, onShow, onHide } from '@dcloudio/uni-app'
 import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only'
+import { usePageAuth } from '@/hooks/usePageAuth'
+
+usePageAuth()
 
 onLaunch(() => {
   console.log('App Launch')
diff --git a/src/hooks/usePageAuth.ts b/src/hooks/usePageAuth.ts
new file mode 100644
index 0000000..e8431c5
--- /dev/null
+++ b/src/hooks/usePageAuth.ts
@@ -0,0 +1,48 @@
+import { onLoad } from '@dcloudio/uni-app'
+import { needLoginPages as _needLoginPages, getNeedLoginPages } from '@/utils'
+import { useUserStore } from '@/store'
+
+const loginRoute = import.meta.env.VITE_LOGIN_URL
+const isDev = import.meta.env.DEV
+
+// 检查当前页面是否需要登录
+export function usePageAuth() {
+  onLoad((options) => {
+    // 获取当前页面路径
+    const pages = getCurrentPages()
+    const currentPage = pages[pages.length - 1]
+    const currentPath = `/${currentPage.route}`
+
+    // 获取需要登录的页面列表
+    let needLoginPages: string[] = []
+    if (isDev) {
+      needLoginPages = getNeedLoginPages()
+    } else {
+      needLoginPages = _needLoginPages
+    }
+
+    // 检查当前页面是否需要登录
+    const isNeedLogin = needLoginPages.includes(currentPath)
+    if (!isNeedLogin) {
+      return
+    }
+
+    // 检查是否已登录
+    const userStore = useUserStore()
+    const hasLogin = userStore.isLogined
+    if (hasLogin) {
+      return
+    }
+
+    // 构建重定向URL
+    const queryString = Object.entries(options || {})
+      .map(([key, value]) => `${key}=${encodeURIComponent(String(value))}`)
+      .join('&')
+
+    const currentFullPath = queryString ? `${currentPath}?${queryString}` : currentPath
+    const redirectRoute = `${loginRoute}?redirect=${encodeURIComponent(currentFullPath)}`
+
+    // 重定向到登录页
+    uni.redirectTo({ url: redirectRoute })
+  })
+}
diff --git a/src/interceptors/route.ts b/src/interceptors/route.ts
index 060c6f3..bed2af0 100644
--- a/src/interceptors/route.ts
+++ b/src/interceptors/route.ts
@@ -8,7 +8,7 @@ import { useUserStore } from '@/store'
 import { needLoginPages as _needLoginPages, getNeedLoginPages, getLastPage } from '@/utils'
 
 // TODO Check
-const loginRoute = '/pages/login/index'
+const loginRoute = import.meta.env.VITE_LOGIN_URL
 
 const isLogined = () => {
   const userStore = useUserStore()

From 7e81d97742c699836b3c9677672e9a7debadca71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=89=91=E6=9C=AF?= <864822121@qq.com>
Date: Wed, 4 Jun 2025 12:45:33 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加isLogined函数以简化登录状态检查
- 更新usePageAuth函数，使用isLogined来判断用户是否已登录
---
 src/hooks/usePageAuth.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/hooks/usePageAuth.ts b/src/hooks/usePageAuth.ts
index e8431c5..5ce7ff3 100644
--- a/src/hooks/usePageAuth.ts
+++ b/src/hooks/usePageAuth.ts
@@ -4,7 +4,10 @@ import { useUserStore } from '@/store'
 
 const loginRoute = import.meta.env.VITE_LOGIN_URL
 const isDev = import.meta.env.DEV
-
+const isLogined = () => {
+  const userStore = useUserStore()
+  return !!userStore.userInfo.username
+}
 // 检查当前页面是否需要登录
 export function usePageAuth() {
   onLoad((options) => {
@@ -27,11 +30,9 @@ export function usePageAuth() {
       return
     }
 
-    // 检查是否已登录
-    const userStore = useUserStore()
-    const hasLogin = userStore.isLogined
+    const hasLogin = isLogined()
     if (hasLogin) {
-      return
+      return true
     }
 
     // 构建重定向URL

From 6eccf0a29448c532e7555351dd3e59c1a818af18 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Wed, 4 Jun 2025 17:40:49 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=20ES6=20?=
 =?UTF-8?q?=E8=BD=AC=20ES5=20=E5=92=8C=E5=8E=8B=E7=BC=A9=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E5=88=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.config.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manifest.config.ts b/manifest.config.ts
index 3ab58c5..2a8b454 100644
--- a/manifest.config.ts
+++ b/manifest.config.ts
@@ -113,6 +113,9 @@ export default defineManifestConfig({
     appid: VITE_WX_APPID,
     setting: {
       urlCheck: false,
+      // 是否启用 ES6 转 ES5
+      es6: true,
+      minified: true,
     },
     usingComponents: true,
     // __usePrivacyCheck__: true,