From 70d261a075101f16e15ea8ca0374f86a6d8d0a1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Sep 2024 01:58:53 +0000
Subject: [PATCH 1/7] build(deps-dev): bump @typescript-eslint/parser from
 7.18.0 to 8.6.0

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 7.18.0 to 8.6.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.6.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 68 +++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index c845ddf..0ec4edb 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "@types/sass": "1.45.0",
     "@types/webpack-env": "^1.18.5",
     "@typescript-eslint/eslint-plugin": "^7.17.0",
-    "@typescript-eslint/parser": "^7.17.0",
+    "@typescript-eslint/parser": "^8.6.0",
     "autoprefixer": "^10.4.19",
     "babel-plugin-import": "^1.13.8",
     "babel-preset-taro": "3.6.35",
diff --git a/yarn.lock b/yarn.lock
index 4083997..470a2de 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4312,21 +4312,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^7.17.0":
-  version: 7.18.0
-  resolution: "@typescript-eslint/parser@npm:7.18.0"
-  dependencies:
-    "@typescript-eslint/scope-manager": "npm:7.18.0"
-    "@typescript-eslint/types": "npm:7.18.0"
-    "@typescript-eslint/typescript-estree": "npm:7.18.0"
-    "@typescript-eslint/visitor-keys": "npm:7.18.0"
+"@typescript-eslint/parser@npm:^8.6.0":
+  version: 8.6.0
+  resolution: "@typescript-eslint/parser@npm:8.6.0"
+  dependencies:
+    "@typescript-eslint/scope-manager": "npm:8.6.0"
+    "@typescript-eslint/types": "npm:8.6.0"
+    "@typescript-eslint/typescript-estree": "npm:8.6.0"
+    "@typescript-eslint/visitor-keys": "npm:8.6.0"
     debug: "npm:^4.3.4"
   peerDependencies:
-    eslint: ^8.56.0
+    eslint: ^8.57.0 || ^9.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/370e73fca4278091bc1b657f85e7d74cd52b24257ea20c927a8e17546107ce04fbf313fec99aed0cc2a145ddbae1d3b12e9cc2c1320117636dc1281bcfd08059
+  checksum: 10c0/3f280d289b486359194d422d89df9896b3f10a6d45cdf851d1d5f3200489271a31ab503c127cb5656f9b0ad6d795dd708b960f21fb105750aac19f41f8f815d1
   languageName: node
   linkType: hard
 
@@ -4350,6 +4350,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/scope-manager@npm:8.6.0":
+  version: 8.6.0
+  resolution: "@typescript-eslint/scope-manager@npm:8.6.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:8.6.0"
+    "@typescript-eslint/visitor-keys": "npm:8.6.0"
+  checksum: 10c0/37092ef70171c06854ac67ebfb2255063890c1c6133654e6b15b6adb6d2ab83de4feafd1599f4d02ed71a018226fcb3a389021758ec045e1904fb1798e90b4fe
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/type-utils@npm:6.21.0":
   version: 6.21.0
   resolution: "@typescript-eslint/type-utils@npm:6.21.0"
@@ -4398,6 +4408,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:8.6.0":
+  version: 8.6.0
+  resolution: "@typescript-eslint/types@npm:8.6.0"
+  checksum: 10c0/e7051d212252f7d1905b5527b211e335db4ec5bb1d3a52d73c8d2de6ddf5cbc981f2c92ca9ffcef35f7447bda635ea1ccce5f884ade7f243d14f2a254982c698
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:6.21.0":
   version: 6.21.0
   resolution: "@typescript-eslint/typescript-estree@npm:6.21.0"
@@ -4436,6 +4453,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/typescript-estree@npm:8.6.0":
+  version: 8.6.0
+  resolution: "@typescript-eslint/typescript-estree@npm:8.6.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:8.6.0"
+    "@typescript-eslint/visitor-keys": "npm:8.6.0"
+    debug: "npm:^4.3.4"
+    fast-glob: "npm:^3.3.2"
+    is-glob: "npm:^4.0.3"
+    minimatch: "npm:^9.0.4"
+    semver: "npm:^7.6.0"
+    ts-api-utils: "npm:^1.3.0"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10c0/33ab8c03221a797865301f09d1d198c67f8b0e3dbf0d13e41f699dc2740242303a9fcfd7b38302cef318541fdedd832fd6e8ba34a5041a57e9114fa134045385
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/utils@npm:6.21.0":
   version: 6.21.0
   resolution: "@typescript-eslint/utils@npm:6.21.0"
@@ -4487,6 +4523,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:8.6.0":
+  version: 8.6.0
+  resolution: "@typescript-eslint/visitor-keys@npm:8.6.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:8.6.0"
+    eslint-visitor-keys: "npm:^3.4.3"
+  checksum: 10c0/9bd5d5daee9de7e009fdd1b64b1eca685a699d1b2639373bc279c97e25e769fff56fffef708ef66a2b19bc8bb201d36daf9e7084f0e0872178bfcf9d923b41f3
+  languageName: node
+  linkType: hard
+
 "@ungap/structured-clone@npm:^1.2.0":
   version: 1.2.0
   resolution: "@ungap/structured-clone@npm:1.2.0"
@@ -12671,7 +12717,7 @@ __metadata:
     "@types/sass": "npm:1.45.0"
     "@types/webpack-env": "npm:^1.18.5"
     "@typescript-eslint/eslint-plugin": "npm:^7.17.0"
-    "@typescript-eslint/parser": "npm:^7.17.0"
+    "@typescript-eslint/parser": "npm:^8.6.0"
     autoprefixer: "npm:^10.4.19"
     babel-plugin-import: "npm:^1.13.8"
     babel-preset-taro: "npm:3.6.35"

From 867589aea5cd3cdeff08129a2eb7a9725ae1fd96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Sep 2024 22:11:57 +0000
Subject: [PATCH 2/7] build(deps): bump @tarojs/plugin-platform-qq from 3.6.33
 to 4.0.5

Bumps [@tarojs/plugin-platform-qq](https://github.com/NervJS/taro) from 3.6.33 to 4.0.5.
- [Release notes](https://github.com/NervJS/taro/releases)
- [Commits](https://github.com/NervJS/taro/compare/v3.6.33...v4.0.5)

---
updated-dependencies:
- dependency-name: "@tarojs/plugin-platform-qq"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 91 ++++++++--------------------------------------------
 2 files changed, 14 insertions(+), 79 deletions(-)

diff --git a/package.json b/package.json
index d15d994..15952b2 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@tarojs/plugin-platform-alipay": "3.6.34",
     "@tarojs/plugin-platform-h5": "4.0.5",
     "@tarojs/plugin-platform-jd": "3.6.34",
-    "@tarojs/plugin-platform-qq": "3.6.33",
+    "@tarojs/plugin-platform-qq": "4.0.5",
     "@tarojs/plugin-platform-swan": "4.0.5",
     "@tarojs/plugin-platform-tt": "4.0.5",
     "@tarojs/plugin-platform-weapp": "4.0.5",
diff --git a/yarn.lock b/yarn.lock
index 4ede151..885c327 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2984,41 +2984,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tarojs/helper@npm:3.6.33":
-  version: 3.6.33
-  resolution: "@tarojs/helper@npm:3.6.33"
-  dependencies:
-    "@babel/core": "npm:^7.14.5"
-    "@babel/parser": "npm:^7.14.5"
-    "@babel/plugin-proposal-decorators": "npm:^7.14.5"
-    "@babel/plugin-proposal-object-rest-spread": "npm:^7.14.5"
-    "@babel/plugin-transform-runtime": "npm:^7.14.5"
-    "@babel/preset-env": "npm:^7.14.5"
-    "@babel/preset-typescript": "npm:^7.14.5"
-    "@babel/register": "npm:^7.14.5"
-    "@babel/runtime": "npm:^7.14.5"
-    "@babel/traverse": "npm:^7.14.5"
-    "@swc/core": "npm:1.3.96"
-    "@swc/register": "npm:0.1.10"
-    ansi-escapes: "npm:^4.3.2"
-    chalk: "npm:3.0.0"
-    chokidar: "npm:^3.3.1"
-    cross-spawn: "npm:^7.0.3"
-    debug: "npm:4.3.4"
-    dotenv: "npm:^16.0.3"
-    dotenv-expand: "npm:^9.0.0"
-    esbuild: "npm:~0.19.5"
-    find-yarn-workspace-root: "npm:2.0.0"
-    fs-extra: "npm:^8.0.1"
-    lodash: "npm:^4.17.21"
-    require-from-string: "npm:^2.0.2"
-    resolve: "npm:^1.22.0"
-    supports-hyperlinks: "npm:^2.2.0"
-    yauzl: "npm:2.10.0"
-  checksum: 10c0/25950a0e557da821bd1a92caff580a1d84977b217156e28055c54f4ea93d17d8dbe2284bd525bf35ef04d2db118a90878f8b3709739f59bd4a7621ac9ef25e30
-  languageName: node
-  linkType: hard
-
 "@tarojs/helper@npm:3.6.34":
   version: 3.6.34
   resolution: "@tarojs/helper@npm:3.6.34"
@@ -3332,18 +3297,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tarojs/plugin-platform-qq@npm:3.6.33":
-  version: 3.6.33
-  resolution: "@tarojs/plugin-platform-qq@npm:3.6.33"
-  dependencies:
-    "@tarojs/plugin-platform-weapp": "npm:3.6.33"
-    "@tarojs/service": "npm:3.6.33"
-  peerDependencies:
-    "@tarojs/shared": ~3.6.33
-  checksum: 10c0/68c47ab925b233e21be2d71a3bac225395202f243171e4f4767c7b0c16b69012a178b0a8e1f7da3a5728af904396f3ad84d5404908c7ef449351c72a09dc7fdd
-  languageName: node
-  linkType: hard
-
 "@tarojs/plugin-platform-qq@npm:3.6.35":
   version: 3.6.35
   resolution: "@tarojs/plugin-platform-qq@npm:3.6.35"
@@ -3356,6 +3309,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tarojs/plugin-platform-qq@npm:4.0.5":
+  version: 4.0.5
+  resolution: "@tarojs/plugin-platform-qq@npm:4.0.5"
+  dependencies:
+    "@tarojs/plugin-platform-weapp": "npm:4.0.5"
+  peerDependencies:
+    "@tarojs/plugin-platform-weapp": 4.0.5
+    "@tarojs/shared": 4.0.5
+  checksum: 10c0/5e2409e2dada11339c406cf8be8bb744af380caf84bc960868c42cc501a37220638a4fbb74b4db9aa749e0b9e2b739ff41511f99cfe86504807ef55f9fa2c5aa
+  languageName: node
+  linkType: hard
+
 "@tarojs/plugin-platform-swan@npm:3.6.35":
   version: 3.6.35
   resolution: "@tarojs/plugin-platform-swan@npm:3.6.35"
@@ -3401,18 +3366,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tarojs/plugin-platform-weapp@npm:3.6.33":
-  version: 3.6.33
-  resolution: "@tarojs/plugin-platform-weapp@npm:3.6.33"
-  dependencies:
-    "@tarojs/service": "npm:3.6.33"
-  peerDependencies:
-    "@tarojs/components": ~3.6.33
-    "@tarojs/shared": ~3.6.33
-  checksum: 10c0/bbb50b9499533f9ad8f45658c967c59c105ebe7b3727d6509c4c48cdc1db0a060ed1b8522dab08bc69ccee2c22f5992283d97cd9404c52bf3c61956e0b6f8ead
-  languageName: node
-  linkType: hard
-
 "@tarojs/plugin-platform-weapp@npm:3.6.35":
   version: 3.6.35
   resolution: "@tarojs/plugin-platform-weapp@npm:3.6.35"
@@ -3509,24 +3462,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tarojs/service@npm:3.6.33":
-  version: 3.6.33
-  resolution: "@tarojs/service@npm:3.6.33"
-  dependencies:
-    "@tarojs/helper": "npm:3.6.33"
-    joi: "npm:^17.6.0"
-    lodash: "npm:^4.17.21"
-    ora: "npm:^5.0.0"
-    resolve: "npm:^1.22.0"
-    tapable: "npm:^1.1.3"
-    webpack-merge: "npm:^4.2.2"
-  peerDependencies:
-    "@tarojs/shared": ~3.6.33
-    "@tarojs/taro": ~3.6.33
-  checksum: 10c0/01852653b1e7a7e9cda1fb5006ea902961137501e2784e969839d22a6f6b604b3138996abcf4674f9154943bf6e0192dc8ab0cdfed2680a68908111746fba6d8
-  languageName: node
-  linkType: hard
-
 "@tarojs/service@npm:3.6.34":
   version: 3.6.34
   resolution: "@tarojs/service@npm:3.6.34"
@@ -12654,7 +12589,7 @@ __metadata:
     "@tarojs/plugin-platform-alipay": "npm:3.6.34"
     "@tarojs/plugin-platform-h5": "npm:4.0.5"
     "@tarojs/plugin-platform-jd": "npm:3.6.34"
-    "@tarojs/plugin-platform-qq": "npm:3.6.33"
+    "@tarojs/plugin-platform-qq": "npm:4.0.5"
     "@tarojs/plugin-platform-swan": "npm:4.0.5"
     "@tarojs/plugin-platform-tt": "npm:4.0.5"
     "@tarojs/plugin-platform-weapp": "npm:4.0.5"

From a085abddad6b08f9f866542d12bd16c8f90ca0a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 21 Sep 2024 15:22:41 +0000
Subject: [PATCH 3/7] build(deps): bump @tarojs/plugin-framework-react from
 3.6.34 to 4.0.5

Bumps [@tarojs/plugin-framework-react](https://github.com/NervJS/taro) from 3.6.34 to 4.0.5.
- [Release notes](https://github.com/NervJS/taro/releases)
- [Commits](https://github.com/NervJS/taro/compare/v3.6.34...v4.0.5)

---
updated-dependencies:
- dependency-name: "@tarojs/plugin-framework-react"
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 50 ++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 4c36f10..6d36627 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@tarojs/components": "4.0.5",
     "@tarojs/components-advanced": "^4.0.5",
     "@tarojs/helper": "3.6.34",
-    "@tarojs/plugin-framework-react": "3.6.34",
+    "@tarojs/plugin-framework-react": "4.0.5",
     "@tarojs/plugin-platform-alipay": "3.6.34",
     "@tarojs/plugin-platform-h5": "4.0.5",
     "@tarojs/plugin-platform-jd": "3.6.34",
diff --git a/yarn.lock b/yarn.lock
index c24fa3b..a95c727 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3239,31 +3239,44 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tarojs/plugin-framework-react@npm:3.6.34":
-  version: 3.6.34
-  resolution: "@tarojs/plugin-framework-react@npm:3.6.34"
+"@tarojs/plugin-framework-react@npm:4.0.5":
+  version: 4.0.5
+  resolution: "@tarojs/plugin-framework-react@npm:4.0.5"
   dependencies:
-    "@tarojs/helper": "npm:3.6.34"
-    "@tarojs/service": "npm:3.6.34"
-    acorn: "npm:^8.0.4"
-    acorn-walk: "npm:^8.0.0"
+    acorn: "npm:^8.11.3"
+    acorn-walk: "npm:^8.3.2"
     lodash: "npm:^4.17.21"
+    tslib: "npm:^2.6.2"
   peerDependencies:
-    "@tarojs/runtime": ~3.6.34
-    "@tarojs/shared": ~3.6.34
-    react: ">=17"
+    "@pmmmwh/react-refresh-webpack-plugin": "*"
+    "@preact/preset-vite": ^2
+    "@prefresh/webpack": ^4
+    "@tarojs/helper": 4.0.5
+    "@tarojs/runtime": 4.0.5
+    "@tarojs/shared": 4.0.5
+    "@vitejs/plugin-react": ^4
+    preact: ^10
+    react: ^18
+    vite: ^4
+    webpack: ^5
   peerDependenciesMeta:
     "@pmmmwh/react-refresh-webpack-plugin":
       optional: true
+    "@preact/preset-vite":
+      optional: true
     "@prefresh/webpack":
       optional: true
+    "@vitejs/plugin-react":
+      optional: true
     preact:
       optional: true
     react:
       optional: true
-    react-refresh:
+    vite:
+      optional: true
+    webpack:
       optional: true
-  checksum: 10c0/c90d7b44640f82985c628cb00a6ff69e0da98720469c97305899e2a09e818754ab02575a77cc6471768a7604aefe45fe73202ac2cddc5a9e8c7ad86df6f07581
+  checksum: 10c0/c2bcd76485775dae0b4120b36753176d07d50bbf9c04c02cbcc2a13dff666dbb6a8e0f5f6d63bc1f1f844d00d340df7d2b49886fc745db5e2b8f0e6ca1158231
   languageName: node
   linkType: hard
 
@@ -4823,7 +4836,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.11.0, acorn@npm:^8.11.3, acorn@npm:^8.12.1, acorn@npm:^8.4.1, acorn@npm:^8.7.0, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
+"acorn-walk@npm:^8.3.2":
+  version: 8.3.4
+  resolution: "acorn-walk@npm:8.3.4"
+  dependencies:
+    acorn: "npm:^8.11.0"
+  checksum: 10c0/76537ac5fb2c37a64560feaf3342023dadc086c46da57da363e64c6148dc21b57d49ace26f949e225063acb6fb441eabffd89f7a3066de5ad37ab3e328927c62
+  languageName: node
+  linkType: hard
+
+"acorn@npm:^8.1.0, acorn@npm:^8.11.0, acorn@npm:^8.11.3, acorn@npm:^8.12.1, acorn@npm:^8.4.1, acorn@npm:^8.7.0, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
   version: 8.12.1
   resolution: "acorn@npm:8.12.1"
   bin:
@@ -12650,7 +12672,7 @@ __metadata:
     "@tarojs/components": "npm:4.0.5"
     "@tarojs/components-advanced": "npm:^4.0.5"
     "@tarojs/helper": "npm:3.6.34"
-    "@tarojs/plugin-framework-react": "npm:3.6.34"
+    "@tarojs/plugin-framework-react": "npm:4.0.5"
     "@tarojs/plugin-platform-alipay": "npm:3.6.34"
     "@tarojs/plugin-platform-h5": "npm:4.0.5"
     "@tarojs/plugin-platform-jd": "npm:3.6.34"

From 35d341444c6becbbb5ab9b9a090acc18c3b16fdb Mon Sep 17 00:00:00 2001
From: eleliauk <2831336720@qq.com>
Date: Sun, 22 Sep 2024 00:13:07 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=F0=9F=90=9E=20fix=EF=BC=9Amerge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/components/chart/index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/common/components/chart/index.tsx b/src/common/components/chart/index.tsx
index 19e2ee0..f64f462 100644
--- a/src/common/components/chart/index.tsx
+++ b/src/common/components/chart/index.tsx
@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
+// eslint-disable-next-line simple-import-sort/imports
 import { Canvas } from '@tarojs/components';
 import Taro, { CanvasContext, Canvas as CanvasInterface } from '@tarojs/taro';
 import React, { CSSProperties, useEffect, useState } from 'react';

From 7de1249984713c560f376eafd4c36afa28ef2229 Mon Sep 17 00:00:00 2001
From: eleliauk <2831336720@qq.com>
Date: Wed, 25 Sep 2024 11:16:41 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat:=E9=9A=90=E7=A7=81=E6=9D=A1=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   4 +
 package.json                                  |  14 --
 .../FloatingWindow/FloatingWindow.tsx         |  74 ++++--
 yarn.lock                                     | 212 ------------------
 4 files changed, 60 insertions(+), 244 deletions(-)

diff --git a/README.md b/README.md
index 10a552c..b2b76b7 100644
--- a/README.md
+++ b/README.md
@@ -49,3 +49,7 @@ $ yarn dev:weapp
 上述文件皆以 ??? 许可授权
 
 > 详细之授权请参考 [LICENSE](LICENSE) 文件
+
+### 📄 内部文档
+
+项目进度和未来计划请参考 [飞书文档](https://muxi.feishu.cn/docx/Q1PwdIMH0opWwRxG8WccgeClnck?from=from_copylink)
diff --git a/package.json b/package.json
index ff4ee34..bb33431 100644
--- a/package.json
+++ b/package.json
@@ -46,19 +46,11 @@
     "@taroify/core": "^0.4.0-alpha.0",
     "@tarojs/components": "4.0.5",
     "@tarojs/components-advanced": "^4.0.5",
-<<<<<<< HEAD
-    "@tarojs/helper": "3.6.34",
-    "@tarojs/plugin-framework-react": "4.0.5",
-    "@tarojs/plugin-platform-alipay": "3.6.34",
-    "@tarojs/plugin-platform-h5": "4.0.5",
-    "@tarojs/plugin-platform-jd": "3.6.34",
-=======
     "@tarojs/helper": "4.0.5",
     "@tarojs/plugin-framework-react": "4.0.5",
     "@tarojs/plugin-platform-alipay": "4.0.5",
     "@tarojs/plugin-platform-h5": "4.0.5",
     "@tarojs/plugin-platform-jd": "4.0.5",
->>>>>>> 6711c00fb72d013457788d1ef4d78ce99c93bdb2
     "@tarojs/plugin-platform-qq": "4.0.5",
     "@tarojs/plugin-platform-swan": "4.0.5",
     "@tarojs/plugin-platform-tt": "4.0.5",
@@ -92,15 +84,9 @@
     "@types/react": "^18.3.8",
     "@types/sass": "1.45.0",
     "@types/webpack-env": "^1.18.5",
-<<<<<<< HEAD
-    "@typescript-eslint/eslint-plugin": "^7.17.0",
-    "@typescript-eslint/parser": "^8.6.0",
-    "autoprefixer": "^10.4.19",
-=======
     "@typescript-eslint/eslint-plugin": "^8.6.0",
     "@typescript-eslint/parser": "^8.6.0",
     "autoprefixer": "^10.4.20",
->>>>>>> 6711c00fb72d013457788d1ef4d78ce99c93bdb2
     "babel-plugin-import": "^1.13.8",
     "babel-preset-taro": "3.6.35",
     "cache-loader": "^4.1.0",
diff --git a/src/common/components/FloatingWindow/FloatingWindow.tsx b/src/common/components/FloatingWindow/FloatingWindow.tsx
index 3a717bd..752e29c 100644
--- a/src/common/components/FloatingWindow/FloatingWindow.tsx
+++ b/src/common/components/FloatingWindow/FloatingWindow.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable react/jsx-key */
-import { Swiper, SwiperItem, View } from '@tarojs/components';
+import { ScrollView, View } from '@tarojs/components';
 import React from 'react';
 
 import './index.scss';
@@ -7,41 +7,79 @@ import './index.scss';
 type FloatingWindowProps = object;
 
 const FloatingWindow: React.FC<FloatingWindowProps> = () => {
-  const pages = [<Page1 />, <Page2 />, <Page3 />, <Page4 />];
-
   return (
     <View className="floating_window_background">
-      <Swiper
+      <ScrollView
         className="floating_window_content"
-        indicatorColor="#999"
-        indicatorActiveColor="#333"
-        circular
-        indicatorDots
+        scrollY
+        style={{ height: '70vh' }} // 确保内容可以滚动
       >
-        {pages.map((page, index) => (
-          <SwiperItem key={index} className="floating_window_slide">
-            {page}
-          </SwiperItem>
-        ))}
-      </Swiper>
+        <Page1 />
+        <Page2 />
+        <Page3 />
+        <Page4 />
+      </ScrollView>
     </View>
   );
 };
 
 const Page1 = () => {
-  return <View>1</View>;
+  return (
+    <View className="page">
+      <View>木犀课栈隐私条例</View>
+      作为华中师范大学学生自主运营的互联网技术团队，木犀一直高度重
+      视隐私保护、郑重对待相应责任，并已将隐私保护的要求融入日常业务活动流程。
+      希望您仔细阅读本条例，详细了解我们对信息的收集、使用方式，以便您更好地
+      了解我们的服务并作出适当的选择。若您使用木犀课栈的服务，即表示您认同我
+      们在本条例中所述内容。
+    </View>
+  );
 };
 
 const Page2 = () => {
-  return <View>2</View>;
+  return (
+    <View className="page">
+      我们收集的信息
+      我们根据合法、正当、必要的原则，仅收集实现产品功能所必要的信息，并将竭力通过有效的信息安全技术及管理流程，防止您的信息泄露、损毁、丢失。
+      1、您在使用我们服务时主动提供的信息
+      （1）您在登录时填写的信息。木犀课栈将采用华中师范大学一站式门户的账号密码进行登录，以此获取您的课程信息。
+      （2）您在使用服务时填写的信息。例如您上传的头像。
+      （3）我们的部分服务可能需要您提供特定的个人敏感信息来实现特定功能。若您选择不提供该类信息，则可能无法正常使用服务中的特定功能，但不影响您使用服务中的其他功能。若您主动提供您的个人敏感信息，即表示您同意我们按本条例所述目的和方式来处理您的个人敏感信息。
+      2、我们在您使用服务时获取的信息
+      当您使用我们的服务时，我们可能会存储服务日志信息。例如搜索、查看的信息、服务故障信息等。
+    </View>
+  );
 };
 
 const Page3 = () => {
-  return <View>3</View>;
+  return (
+    <View className="page">
+      3、其他相关信息
+      （1）其他用户分享的信息中含有您的信息。例如，其他用户分享的截图中可能包含您的信息。
+      （2）从第三方合作伙伴获取的信息。例如，您使用QQ授权登录时，我们会获得您登录的名称、登录时间，方便您进行授权管理。请您仔细阅读第三方合作伙伴服务的用户协议或隐私政策。
+      我们如何使用收集的信息
+      我们严格遵守法律法规的规定及与用户的约定，将收集的信息用于以下用途。若我们超出以下用途使用您的信息，我们将再次向您进行说明，并征得您的同意。
+      1、向您提供服务
+      2、产品开发和服务优化。例如，当我们的系统发生故障时，我们会记录和分析系统故障时产生的信息，优化我们的服务。
+      3、为了确保服务的安全，帮助我们更好地了解我们应用程序的运行情况，我们可能记录相关信息，例如，您使用应用程序的频率、故障信息、总体使用情况、性能数据以及应用程序的来源。我们不会将我们存储在分析软件中的信息与您在应用程序中提供的个人身份信息相结合。
+      您分享的信息
+      您可以通过我们的服务与好友分享相关课程或评价信息。例如，在空间中公开分享课程评价和课表。
+      请注意，这其中可能包含您的个人身份信息、个人课程信息等敏感信息，请您谨慎考虑披露您的相关个人敏感信息，这些信息可能由其他用户或不受我们控制的非关联第三方独立保存。
+      我们可能向您发送的信息
+    </View>
+  );
 };
 
 const Page4 = () => {
-  return <View>4</View>;
+  return (
+    <View className="page">
+      1、信息推送：您在使用我们的服务时，我们会向您发送通知信息。
+      2、与服务有关的公告：我们可能在必要时（例如，因系统维护而暂停某一项服务时）向您发出与服务有关的公告。
+      联系我们 如您对本条例或其他相关事宜有疑问， 请通过QQ群：799651462与我们联系。
+      您也可以将问题发送至邮箱：i@muxistudio.com
+      我们将在验证您的用户身份后，尽快审核所涉问题并予以回复。
+    </View>
+  );
 };
 
 export default FloatingWindow;
diff --git a/yarn.lock b/yarn.lock
index 57b66bf..fee2b18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3007,44 +3007,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@tarojs/helper@npm:3.6.34":
-  version: 3.6.34
-  resolution: "@tarojs/helper@npm:3.6.34"
-  dependencies:
-    "@babel/core": "npm:^7.14.5"
-    "@babel/parser": "npm:^7.14.5"
-    "@babel/plugin-proposal-decorators": "npm:^7.14.5"
-    "@babel/plugin-proposal-object-rest-spread": "npm:^7.14.5"
-    "@babel/plugin-transform-runtime": "npm:^7.14.5"
-    "@babel/preset-env": "npm:^7.14.5"
-    "@babel/preset-typescript": "npm:^7.14.5"
-    "@babel/register": "npm:^7.14.5"
-    "@babel/runtime": "npm:^7.14.5"
-    "@babel/traverse": "npm:^7.14.5"
-    "@swc/core": "npm:1.3.96"
-    "@swc/register": "npm:0.1.10"
-    ansi-escapes: "npm:^4.3.2"
-    chalk: "npm:3.0.0"
-    chokidar: "npm:^3.3.1"
-    cross-spawn: "npm:^7.0.3"
-    debug: "npm:4.3.4"
-    dotenv: "npm:^16.0.3"
-    dotenv-expand: "npm:^9.0.0"
-    esbuild: "npm:~0.19.5"
-    find-yarn-workspace-root: "npm:2.0.0"
-    fs-extra: "npm:^8.0.1"
-    lodash: "npm:^4.17.21"
-    require-from-string: "npm:^2.0.2"
-    resolve: "npm:^1.22.0"
-    supports-hyperlinks: "npm:^2.2.0"
-    yauzl: "npm:2.10.0"
-  checksum: 10c0/0a24e9f772e5b9046367716c421ac29c675cdfec3f0efba3571e501318d8b30d30945ac458b5a97025fafa5d317c74d816bbf8cc200bbe655df9f92725728203
-  languageName: node
-  linkType: hard
-
-=======
->>>>>>> 6711c00fb72d013457788d1ef4d78ce99c93bdb2
 "@tarojs/helper@npm:3.6.35":
   version: 3.6.35
   resolution: "@tarojs/helper@npm:3.6.35"
@@ -3291,32 +3253,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@tarojs/plugin-platform-jd@npm:3.6.34":
-  version: 3.6.34
-  resolution: "@tarojs/plugin-platform-jd@npm:3.6.34"
-  dependencies:
-    "@tarojs/service": "npm:3.6.34"
-    "@tarojs/shared": "npm:3.6.34"
-  checksum: 10c0/02b0cdc2d1f9829e5adbac6d121b050fada8c278cefc7670ad0d713f6c9fb35e0c36b114dabed93cab885441f9010632d03cfc9b2e1dfcc8ac6d2852918ee6e2
-  languageName: node
-  linkType: hard
-
-"@tarojs/plugin-platform-jd@npm:3.6.35":
-  version: 3.6.35
-  resolution: "@tarojs/plugin-platform-jd@npm:3.6.35"
-  dependencies:
-    "@tarojs/components": "npm:3.6.35"
-    "@tarojs/service": "npm:3.6.35"
-    "@tarojs/shared": "npm:3.6.35"
-  checksum: 10c0/21937b6a2fdc0dc15cb2c35fdc1a614a22b92b86512a773fa9a8023b1b519ef66a11e4840bfba4f9d4cc2c525a84c72fa82c17e8bf95e6a0e6f987e8b7e9498e
-  languageName: node
-  linkType: hard
-
-"@tarojs/plugin-platform-qq@npm:3.6.35":
-  version: 3.6.35
-  resolution: "@tarojs/plugin-platform-qq@npm:3.6.35"
-=======
 "@tarojs/plugin-platform-jd@npm:4.0.5":
   version: 4.0.5
   resolution: "@tarojs/plugin-platform-jd@npm:4.0.5"
@@ -3327,19 +3263,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tarojs/plugin-platform-qq@npm:4.0.5":
-  version: 4.0.5
-  resolution: "@tarojs/plugin-platform-qq@npm:4.0.5"
->>>>>>> 6711c00fb72d013457788d1ef4d78ce99c93bdb2
-  dependencies:
-    "@tarojs/plugin-platform-weapp": "npm:4.0.5"
-  peerDependencies:
-<<<<<<< HEAD
-    "@tarojs/shared": ~3.6.35
-  checksum: 10c0/91aa12a4f1796d3310abdd179916d91a041bc64b746940e3019a230b413dc7d90154e8eb1e0864b8d5c80a8e1b5f3cc8e61aec82b95fdd8fbcf10aa79fd944ee
-  languageName: node
-  linkType: hard
-
 "@tarojs/plugin-platform-qq@npm:4.0.5":
   version: 4.0.5
   resolution: "@tarojs/plugin-platform-qq@npm:4.0.5"
@@ -3352,23 +3275,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tarojs/plugin-platform-swan@npm:3.6.35":
-  version: 3.6.35
-  resolution: "@tarojs/plugin-platform-swan@npm:3.6.35"
-  dependencies:
-    "@tarojs/service": "npm:3.6.35"
-  peerDependencies:
-    "@tarojs/components": ~3.6.35
-    "@tarojs/shared": ~3.6.35
-  checksum: 10c0/5aac8eebcb688ce8461c7e1efe97b890e5f2c9e81790d5a863419a0b4faf92f517c290b7fda9b9af4fe4c936189a7efb9c9484f088d9ec5f14eea621b0021467
-=======
-    "@tarojs/plugin-platform-weapp": 4.0.5
-    "@tarojs/shared": 4.0.5
-  checksum: 10c0/5e2409e2dada11339c406cf8be8bb744af380caf84bc960868c42cc501a37220638a4fbb74b4db9aa749e0b9e2b739ff41511f99cfe86504807ef55f9fa2c5aa
->>>>>>> 6711c00fb72d013457788d1ef4d78ce99c93bdb2
-  languageName: node
-  linkType: hard
-
 "@tarojs/plugin-platform-swan@npm:4.0.5":
   version: 4.0.5
   resolution: "@tarojs/plugin-platform-swan@npm:4.0.5"
@@ -3389,21 +3295,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@tarojs/plugin-platform-weapp@npm:3.6.35":
-  version: 3.6.35
-  resolution: "@tarojs/plugin-platform-weapp@npm:3.6.35"
-  dependencies:
-    "@tarojs/service": "npm:3.6.35"
-  peerDependencies:
-    "@tarojs/components": ~3.6.35
-    "@tarojs/shared": ~3.6.35
-  checksum: 10c0/4bcef948f9402fb323156507baa1202f117f44669a91fc7d5df600fe755f880b93a9c3720dc705b28529f7b51210a7460f0361f85675047e9ad7fb690d7bbee0
-  languageName: node
-  linkType: hard
-
-=======
->>>>>>> 6711c00fb72d013457788d1ef4d78ce99c93bdb2
 "@tarojs/plugin-platform-weapp@npm:4.0.5":
   version: 4.0.5
   resolution: "@tarojs/plugin-platform-weapp@npm:4.0.5"
@@ -3466,45 +3357,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"@tarojs/service@npm:3.6.34":
-  version: 3.6.34
-  resolution: "@tarojs/service@npm:3.6.34"
-  dependencies:
-    "@tarojs/helper": "npm:3.6.34"
-    joi: "npm:^17.6.0"
-    lodash: "npm:^4.17.21"
-    ora: "npm:^5.0.0"
-    resolve: "npm:^1.22.0"
-    tapable: "npm:^1.1.3"
-    webpack-merge: "npm:^4.2.2"
-  peerDependencies:
-    "@tarojs/shared": ~3.6.34
-    "@tarojs/taro": ~3.6.34
-  checksum: 10c0/31f5e22aa457ae2ad70ced5b8f1b4dba5073b5964c3b3e32528ceeea8c6d8f69939e5b66752b9842aad7fdf9383b7e777c4ce5fa1292522c1a85f0ac0ff49c49
-  languageName: node
-  linkType: hard
-
-"@tarojs/service@npm:3.6.35":
-  version: 3.6.35
-  resolution: "@tarojs/service@npm:3.6.35"
-  dependencies:
-    "@tarojs/helper": "npm:3.6.35"
-    joi: "npm:^17.6.0"
-    lodash: "npm:^4.17.21"
-    ora: "npm:^5.0.0"
-    resolve: "npm:^1.22.0"
-    tapable: "npm:^1.1.3"
-    webpack-merge: "npm:^4.2.2"
-  peerDependencies:
-    "@tarojs/shared": ~3.6.35
-    "@tarojs/taro": ~3.6.35
-  checksum: 10c0/89c3e77d6c4fb05ab3c4fea53fcf00176c7a1c6860ee5b96d9dde253593f6c05ecee891c5810873b546d06b6e90e9a2cf8426e3ef3159201d86a0943b4bb6b83
-  languageName: node
-  linkType: hard
-
-=======
->>>>>>> 6711c00fb72d013457788d1ef4d78ce99c93bdb2
 "@tarojs/service@npm:4.0.5":
   version: 4.0.5
   resolution: "@tarojs/service@npm:4.0.5"
@@ -4219,16 +4071,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:8.6.0":
-  version: 8.6.0
-  resolution: "@typescript-eslint/scope-manager@npm:8.6.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:8.6.0"
-    "@typescript-eslint/visitor-keys": "npm:8.6.0"
-  checksum: 10c0/37092ef70171c06854ac67ebfb2255063890c1c6133654e6b15b6adb6d2ab83de4feafd1599f4d02ed71a018226fcb3a389021758ec045e1904fb1798e90b4fe
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/type-utils@npm:6.21.0":
   version: 6.21.0
   resolution: "@typescript-eslint/type-utils@npm:6.21.0"
@@ -4275,13 +4117,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:8.6.0":
-  version: 8.6.0
-  resolution: "@typescript-eslint/types@npm:8.6.0"
-  checksum: 10c0/e7051d212252f7d1905b5527b211e335db4ec5bb1d3a52d73c8d2de6ddf5cbc981f2c92ca9ffcef35f7447bda635ea1ccce5f884ade7f243d14f2a254982c698
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/typescript-estree@npm:6.21.0":
   version: 6.21.0
   resolution: "@typescript-eslint/typescript-estree@npm:6.21.0"
@@ -4320,25 +4155,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:8.6.0":
-  version: 8.6.0
-  resolution: "@typescript-eslint/typescript-estree@npm:8.6.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:8.6.0"
-    "@typescript-eslint/visitor-keys": "npm:8.6.0"
-    debug: "npm:^4.3.4"
-    fast-glob: "npm:^3.3.2"
-    is-glob: "npm:^4.0.3"
-    minimatch: "npm:^9.0.4"
-    semver: "npm:^7.6.0"
-    ts-api-utils: "npm:^1.3.0"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 10c0/33ab8c03221a797865301f09d1d198c67f8b0e3dbf0d13e41f699dc2740242303a9fcfd7b38302cef318541fdedd832fd6e8ba34a5041a57e9114fa134045385
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/utils@npm:6.21.0":
   version: 6.21.0
   resolution: "@typescript-eslint/utils@npm:6.21.0"
@@ -4390,16 +4206,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:8.6.0":
-  version: 8.6.0
-  resolution: "@typescript-eslint/visitor-keys@npm:8.6.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:8.6.0"
-    eslint-visitor-keys: "npm:^3.4.3"
-  checksum: 10c0/9bd5d5daee9de7e009fdd1b64b1eca685a699d1b2639373bc279c97e25e769fff56fffef708ef66a2b19bc8bb201d36daf9e7084f0e0872178bfcf9d923b41f3
-  languageName: node
-  linkType: hard
-
 "@ungap/structured-clone@npm:^1.2.0":
   version: 1.2.0
   resolution: "@ungap/structured-clone@npm:1.2.0"
@@ -4653,11 +4459,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
-"acorn@npm:^8.1.0, acorn@npm:^8.11.0, acorn@npm:^8.11.3, acorn@npm:^8.12.1, acorn@npm:^8.4.1, acorn@npm:^8.7.0, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
-=======
 "acorn@npm:^8.11.0, acorn@npm:^8.11.3, acorn@npm:^8.12.1, acorn@npm:^8.4.1, acorn@npm:^8.7.0, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
->>>>>>> 6711c00fb72d013457788d1ef4d78ce99c93bdb2
   version: 8.12.1
   resolution: "acorn@npm:8.12.1"
   bin:
@@ -11354,19 +11156,11 @@ __metadata:
     "@tarojs/cli": "npm:4.0.5"
     "@tarojs/components": "npm:4.0.5"
     "@tarojs/components-advanced": "npm:^4.0.5"
-<<<<<<< HEAD
-    "@tarojs/helper": "npm:3.6.34"
-    "@tarojs/plugin-framework-react": "npm:4.0.5"
-    "@tarojs/plugin-platform-alipay": "npm:3.6.34"
-    "@tarojs/plugin-platform-h5": "npm:4.0.5"
-    "@tarojs/plugin-platform-jd": "npm:3.6.34"
-=======
     "@tarojs/helper": "npm:4.0.5"
     "@tarojs/plugin-framework-react": "npm:4.0.5"
     "@tarojs/plugin-platform-alipay": "npm:4.0.5"
     "@tarojs/plugin-platform-h5": "npm:4.0.5"
     "@tarojs/plugin-platform-jd": "npm:4.0.5"
->>>>>>> 6711c00fb72d013457788d1ef4d78ce99c93bdb2
     "@tarojs/plugin-platform-qq": "npm:4.0.5"
     "@tarojs/plugin-platform-swan": "npm:4.0.5"
     "@tarojs/plugin-platform-tt": "npm:4.0.5"
@@ -11381,15 +11175,9 @@ __metadata:
     "@types/react": "npm:^18.3.8"
     "@types/sass": "npm:1.45.0"
     "@types/webpack-env": "npm:^1.18.5"
-<<<<<<< HEAD
-    "@typescript-eslint/eslint-plugin": "npm:^7.17.0"
-    "@typescript-eslint/parser": "npm:^8.6.0"
-    autoprefixer: "npm:^10.4.19"
-=======
     "@typescript-eslint/eslint-plugin": "npm:^8.6.0"
     "@typescript-eslint/parser": "npm:^8.6.0"
     autoprefixer: "npm:^10.4.20"
->>>>>>> 6711c00fb72d013457788d1ef4d78ce99c93bdb2
     babel-plugin-import: "npm:^1.13.8"
     babel-preset-taro: "npm:3.6.35"
     cache-loader: "npm:^4.1.0"

From 44fcc82965cdd91074cc93697363df4f4d7829d5 Mon Sep 17 00:00:00 2001
From: eleliauk <2831336720@qq.com>
Date: Thu, 26 Sep 2024 22:23:05 +0800
Subject: [PATCH 6/7] fix

---
 package.json |   4 +-
 yarn.lock    | 102 +++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 77 insertions(+), 29 deletions(-)

diff --git a/package.json b/package.json
index bb33431..ac3bb85 100644
--- a/package.json
+++ b/package.json
@@ -84,9 +84,9 @@
     "@types/react": "^18.3.8",
     "@types/sass": "1.45.0",
     "@types/webpack-env": "^1.18.5",
-    "@typescript-eslint/eslint-plugin": "^8.6.0",
+    "@typescript-eslint/eslint-plugin": "^7.17.0",
     "@typescript-eslint/parser": "^8.6.0",
-    "autoprefixer": "^10.4.20",
+    "autoprefixer": "^10.4.19",
     "babel-plugin-import": "^1.13.8",
     "babel-preset-taro": "3.6.35",
     "cache-loader": "^4.1.0",
diff --git a/yarn.lock b/yarn.lock
index fee2b18..173084a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3992,26 +3992,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^8.6.0":
-  version: 8.6.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:8.6.0"
+"@typescript-eslint/eslint-plugin@npm:^7.17.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:7.18.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:8.6.0"
-    "@typescript-eslint/type-utils": "npm:8.6.0"
-    "@typescript-eslint/utils": "npm:8.6.0"
-    "@typescript-eslint/visitor-keys": "npm:8.6.0"
+    "@typescript-eslint/scope-manager": "npm:7.18.0"
+    "@typescript-eslint/type-utils": "npm:7.18.0"
+    "@typescript-eslint/utils": "npm:7.18.0"
+    "@typescript-eslint/visitor-keys": "npm:7.18.0"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.3.1"
     natural-compare: "npm:^1.4.0"
     ts-api-utils: "npm:^1.3.0"
   peerDependencies:
-    "@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0
-    eslint: ^8.57.0 || ^9.0.0
+    "@typescript-eslint/parser": ^7.0.0
+    eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/c777f01535b896d3092f9886a67ccf9e50bf9e0f581ffab607c5e95dbf3092299b0d9f3e6041b134d69059a6fa5691785940b81015f73bb9a0e9d1605f6442ea
+  checksum: 10c0/2b37948fa1b0dab77138909dabef242a4d49ab93e4019d4ef930626f0a7d96b03e696cd027fa0087881c20e73be7be77c942606b4a76fa599e6b37f6985304c3
   languageName: node
   linkType: hard
 
@@ -4061,6 +4061,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/scope-manager@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/scope-manager@npm:7.18.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:7.18.0"
+    "@typescript-eslint/visitor-keys": "npm:7.18.0"
+  checksum: 10c0/038cd58c2271de146b3a594afe2c99290034033326d57ff1f902976022c8b0138ffd3cb893ae439ae41003b5e4bcc00cabf6b244ce40e8668f9412cc96d97b8e
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/scope-manager@npm:8.6.0":
   version: 8.6.0
   resolution: "@typescript-eslint/scope-manager@npm:8.6.0"
@@ -4088,18 +4098,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:8.6.0":
-  version: 8.6.0
-  resolution: "@typescript-eslint/type-utils@npm:8.6.0"
+"@typescript-eslint/type-utils@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/type-utils@npm:7.18.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:8.6.0"
-    "@typescript-eslint/utils": "npm:8.6.0"
+    "@typescript-eslint/typescript-estree": "npm:7.18.0"
+    "@typescript-eslint/utils": "npm:7.18.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.3.0"
+  peerDependencies:
+    eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/914b4637caa40c102117655a9b4451e0db611a61309ed39d6c57522655463c059f4dfd4e2d7ffdefcc9ab7533be21fb877b740c58f5be11f3530aa29f3d2cb62
+  checksum: 10c0/ad92a38007be620f3f7036f10e234abdc2fdc518787b5a7227e55fd12896dacf56e8b34578723fbf9bea8128df2510ba8eb6739439a3879eda9519476d5783fd
   languageName: node
   linkType: hard
 
@@ -4110,6 +4122,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/types@npm:7.18.0"
+  checksum: 10c0/eb7371ac55ca77db8e59ba0310b41a74523f17e06f485a0ef819491bc3dd8909bb930120ff7d30aaf54e888167e0005aa1337011f3663dc90fb19203ce478054
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/types@npm:8.6.0":
   version: 8.6.0
   resolution: "@typescript-eslint/types@npm:8.6.0"
@@ -4136,6 +4155,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/typescript-estree@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/typescript-estree@npm:7.18.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:7.18.0"
+    "@typescript-eslint/visitor-keys": "npm:7.18.0"
+    debug: "npm:^4.3.4"
+    globby: "npm:^11.1.0"
+    is-glob: "npm:^4.0.3"
+    minimatch: "npm:^9.0.4"
+    semver: "npm:^7.6.0"
+    ts-api-utils: "npm:^1.3.0"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10c0/0c7f109a2e460ec8a1524339479cf78ff17814d23c83aa5112c77fb345e87b3642616291908dcddea1e671da63686403dfb712e4a4435104f92abdfddf9aba81
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:8.6.0":
   version: 8.6.0
   resolution: "@typescript-eslint/typescript-estree@npm:8.6.0"
@@ -4172,17 +4210,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:8.6.0":
-  version: 8.6.0
-  resolution: "@typescript-eslint/utils@npm:8.6.0"
+"@typescript-eslint/utils@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/utils@npm:7.18.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@typescript-eslint/scope-manager": "npm:8.6.0"
-    "@typescript-eslint/types": "npm:8.6.0"
-    "@typescript-eslint/typescript-estree": "npm:8.6.0"
+    "@typescript-eslint/scope-manager": "npm:7.18.0"
+    "@typescript-eslint/types": "npm:7.18.0"
+    "@typescript-eslint/typescript-estree": "npm:7.18.0"
   peerDependencies:
-    eslint: ^8.57.0 || ^9.0.0
-  checksum: 10c0/5b615106342dfdf09f5a73e2554cc0c4d979c262a9a4548eb76ec7045768e0ff0bf0316cf8a5eb5404689cd476fcd335fc84f90eb985557559e42aeee33d687e
+    eslint: ^8.56.0
+  checksum: 10c0/a25a6d50eb45c514469a01ff01f215115a4725fb18401055a847ddf20d1b681409c4027f349033a95c4ff7138d28c3b0a70253dfe8262eb732df4b87c547bd1e
   languageName: node
   linkType: hard
 
@@ -4196,6 +4234,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:7.18.0":
+  version: 7.18.0
+  resolution: "@typescript-eslint/visitor-keys@npm:7.18.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:7.18.0"
+    eslint-visitor-keys: "npm:^3.4.3"
+  checksum: 10c0/538b645f8ff1d9debf264865c69a317074eaff0255e63d7407046176b0f6a6beba34a6c51d511f12444bae12a98c69891eb6f403c9f54c6c2e2849d1c1cb73c0
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/visitor-keys@npm:8.6.0":
   version: 8.6.0
   resolution: "@typescript-eslint/visitor-keys@npm:8.6.0"
@@ -4829,7 +4877,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"autoprefixer@npm:^10.4.19, autoprefixer@npm:^10.4.20":
+"autoprefixer@npm:^10.4.19":
   version: 10.4.20
   resolution: "autoprefixer@npm:10.4.20"
   dependencies:
@@ -11175,9 +11223,9 @@ __metadata:
     "@types/react": "npm:^18.3.8"
     "@types/sass": "npm:1.45.0"
     "@types/webpack-env": "npm:^1.18.5"
-    "@typescript-eslint/eslint-plugin": "npm:^8.6.0"
+    "@typescript-eslint/eslint-plugin": "npm:^7.17.0"
     "@typescript-eslint/parser": "npm:^8.6.0"
-    autoprefixer: "npm:^10.4.20"
+    autoprefixer: "npm:^10.4.19"
     babel-plugin-import: "npm:^1.13.8"
     babel-preset-taro: "npm:3.6.35"
     cache-loader: "npm:^4.1.0"

From 0a1955105a1192165fea1d13c874536411e87696 Mon Sep 17 00:00:00 2001
From: eleliauk <2831336720@qq.com>
Date: Thu, 26 Sep 2024 22:24:44 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=90=9E=20fix=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=B7=B3=E8=BD=ACbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/editUser/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/editUser/index.tsx b/src/pages/editUser/index.tsx
index 838ada7..da54aba 100644
--- a/src/pages/editUser/index.tsx
+++ b/src/pages/editUser/index.tsx
@@ -118,7 +118,7 @@ const EditUser: React.FC = () => {
       success: (res) => console.log(res),
       fail: (err) => console.log(err),
     });
-    void Taro.redirectTo({ url: '/pages/login/index' });
+    void Taro.reLaunch({ url: '/pages/login/index' });
   };
   return (
     <View>