save

1 year ago · 83586e1d56
12 changed files with 94 additions and 24 deletions
--- a/package.json
+++ b/package.json
@ -18,7 +18,6 @@
				@@ -18,7 +18,6 @@
    "mockjs": "^1.1.0",
    "pinia": "^2.1.7",
    "pinyin": "2.11.1",
-    "vite-plugin-compression": "^0.5.1",
    "vue": "3.4.21",
    "vue-masonry": "0.16.0",
    "vue-router": "4.3.0",
@ -31,6 +30,7 @@
				@@ -31,6 +30,7 @@
    "@vitejs/plugin-vue-jsx": "3.0.0",
    "axios-mock-adapter": "^1.22.0",
    "less": "4.1.3",
+    "vite-plugin-compression": "^0.5.1",
    "rollup-plugin-visualizer": "^5.9.2",
    "unplugin-vue-define-options": "^1.4.1",
    "unplugin-vue-macros": "^2.7.10",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -35,9 +35,6 @@ dependencies:
				@@ -35,9 +35,6 @@ dependencies:
  pinyin:
    specifier: 2.11.1
    version: 2.11.1
-  vite-plugin-compression:
-    specifier: ^0.5.1
-    version: 0.5.1(vite@4.5.2)
  vue:
    specifier: 3.4.21
    version: 3.4.21
@ -85,6 +82,9 @@ devDependencies:
				@@ -85,6 +82,9 @@ devDependencies:
  vite-plugin-cdn-import:
    specifier: 0.3.5
    version: 0.3.5(rollup@2.79.1)
+  vite-plugin-compression:
+    specifier: ^0.5.1
+    version: 0.5.1(vite@4.5.2)
  vite-plugin-imagemin:
    specifier: ^0.6.1
    version: 0.6.1(vite@4.5.2)
@ -413,6 +413,7 @@ packages:
				@@ -413,6 +413,7 @@ packages:
    cpu: [arm64]
    os: [android]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/android-arm@0.18.20:
@ -421,6 +422,7 @@ packages:
				@@ -421,6 +422,7 @@ packages:
    cpu: [arm]
    os: [android]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/android-x64@0.18.20:
@ -429,6 +431,7 @@ packages:
				@@ -429,6 +431,7 @@ packages:
    cpu: [x64]
    os: [android]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/darwin-arm64@0.18.20:
@ -437,6 +440,7 @@ packages:
				@@ -437,6 +440,7 @@ packages:
    cpu: [arm64]
    os: [darwin]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/darwin-x64@0.18.20:
@ -445,6 +449,7 @@ packages:
				@@ -445,6 +449,7 @@ packages:
    cpu: [x64]
    os: [darwin]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/freebsd-arm64@0.18.20:
@ -453,6 +458,7 @@ packages:
				@@ -453,6 +458,7 @@ packages:
    cpu: [arm64]
    os: [freebsd]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/freebsd-x64@0.18.20:
@ -461,6 +467,7 @@ packages:
				@@ -461,6 +467,7 @@ packages:
    cpu: [x64]
    os: [freebsd]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/linux-arm64@0.18.20:
@ -469,6 +476,7 @@ packages:
				@@ -469,6 +476,7 @@ packages:
    cpu: [arm64]
    os: [linux]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/linux-arm@0.18.20:
@ -477,6 +485,7 @@ packages:
				@@ -477,6 +485,7 @@ packages:
    cpu: [arm]
    os: [linux]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/linux-ia32@0.18.20:
@ -485,6 +494,7 @@ packages:
				@@ -485,6 +494,7 @@ packages:
    cpu: [ia32]
    os: [linux]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/linux-loong64@0.14.54:
@ -502,6 +512,7 @@ packages:
				@@ -502,6 +512,7 @@ packages:
    cpu: [loong64]
    os: [linux]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/linux-mips64el@0.18.20:
@ -510,6 +521,7 @@ packages:
				@@ -510,6 +521,7 @@ packages:
    cpu: [mips64el]
    os: [linux]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/linux-ppc64@0.18.20:
@ -518,6 +530,7 @@ packages:
				@@ -518,6 +530,7 @@ packages:
    cpu: [ppc64]
    os: [linux]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/linux-riscv64@0.18.20:
@ -526,6 +539,7 @@ packages:
				@@ -526,6 +539,7 @@ packages:
    cpu: [riscv64]
    os: [linux]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/linux-s390x@0.18.20:
@ -534,6 +548,7 @@ packages:
				@@ -534,6 +548,7 @@ packages:
    cpu: [s390x]
    os: [linux]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/linux-x64@0.18.20:
@ -542,6 +557,7 @@ packages:
				@@ -542,6 +557,7 @@ packages:
    cpu: [x64]
    os: [linux]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/netbsd-x64@0.18.20:
@ -550,6 +566,7 @@ packages:
				@@ -550,6 +566,7 @@ packages:
    cpu: [x64]
    os: [netbsd]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/openbsd-x64@0.18.20:
@ -558,6 +575,7 @@ packages:
				@@ -558,6 +575,7 @@ packages:
    cpu: [x64]
    os: [openbsd]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/sunos-x64@0.18.20:
@ -566,6 +584,7 @@ packages:
				@@ -566,6 +584,7 @@ packages:
    cpu: [x64]
    os: [sunos]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/win32-arm64@0.18.20:
@ -574,6 +593,7 @@ packages:
				@@ -574,6 +593,7 @@ packages:
    cpu: [arm64]
    os: [win32]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/win32-ia32@0.18.20:
@ -582,6 +602,7 @@ packages:
				@@ -582,6 +602,7 @@ packages:
    cpu: [ia32]
    os: [win32]
    requiresBuild: true
+    dev: true
    optional: true

  /@esbuild/win32-x64@0.18.20:
@ -590,6 +611,7 @@ packages:
				@@ -590,6 +611,7 @@ packages:
    cpu: [x64]
    os: [win32]
    requiresBuild: true
+    dev: true
    optional: true

  /@iconify/types@2.0.0:
@ -1329,6 +1351,7 @@ packages:
				@@ -1329,6 +1351,7 @@ packages:
    engines: {node: '>=8'}
    dependencies:
      color-convert: 2.0.1
+    dev: true

  /anymatch@3.1.3:
    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
@ -1622,6 +1645,7 @@ packages:
				@@ -1622,6 +1645,7 @@ packages:
    dependencies:
      ansi-styles: 4.3.0
      supports-color: 7.2.0
+    dev: true

  /chokidar@3.6.0:
    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
@ -1671,6 +1695,7 @@ packages:
				@@ -1671,6 +1695,7 @@ packages:
    engines: {node: '>=7.0.0'}
    dependencies:
      color-name: 1.1.4
+    dev: true

  /color-name@1.1.3:
    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
@ -1678,6 +1703,7 @@ packages:
				@@ -1678,6 +1703,7 @@ packages:

  /color-name@1.1.4:
    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+    dev: true

  /color-support@1.1.3:
    resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==}
@ -1744,6 +1770,7 @@ packages:
				@@ -1744,6 +1770,7 @@ packages:
    resolution: {integrity: sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==}
    dependencies:
      is-what: 3.14.1
+    dev: true

  /core-js@3.21.1:
    resolution: {integrity: sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==}
@ -1851,6 +1878,7 @@ packages:
				@@ -1851,6 +1878,7 @@ packages:
        optional: true
    dependencies:
      ms: 2.1.3
+    dev: true
    optional: true

  /debug@4.3.4:
@ -2061,6 +2089,7 @@ packages:
				@@ -2061,6 +2089,7 @@ packages:
    requiresBuild: true
    dependencies:
      prr: 1.0.1
+    dev: true
    optional: true

  /error-ex@1.3.2:
@ -2306,6 +2335,7 @@ packages:
				@@ -2306,6 +2335,7 @@ packages:
      '@esbuild/win32-arm64': 0.18.20
      '@esbuild/win32-ia32': 0.18.20
      '@esbuild/win32-x64': 0.18.20
+    dev: true

  /escalade@3.1.1:
    resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
@ -2567,6 +2597,7 @@ packages:
				@@ -2567,6 +2597,7 @@ packages:
      graceful-fs: 4.2.11
      jsonfile: 6.1.0
      universalify: 2.0.1
+    dev: true

  /fs-minipass@2.1.0:
    resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
@ -2586,6 +2617,7 @@ packages:
				@@ -2586,6 +2617,7 @@ packages:
    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
    os: [darwin]
    requiresBuild: true
+    dev: true
    optional: true

  /function-bind@1.1.2:
@ -2770,6 +2802,7 @@ packages:
				@@ -2770,6 +2802,7 @@ packages:
  /graceful-fs@4.2.11:
    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
    requiresBuild: true
+    dev: true

  /has-ansi@2.0.0:
    resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==}
@ -2786,6 +2819,7 @@ packages:
				@@ -2786,6 +2819,7 @@ packages:
  /has-flag@4.0.0:
    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
    engines: {node: '>=8'}
+    dev: true

  /has-symbol-support-x@1.4.2:
    resolution: {integrity: sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==}
@ -2851,6 +2885,7 @@ packages:
				@@ -2851,6 +2885,7 @@ packages:
    requiresBuild: true
    dependencies:
      safer-buffer: 2.1.2
+    dev: true
    optional: true

  /ieee754@1.2.1:
@ -2867,6 +2902,7 @@ packages:
				@@ -2867,6 +2902,7 @@ packages:
    engines: {node: '>=0.10.0'}
    hasBin: true
    requiresBuild: true
+    dev: true
    optional: true

  /imagemin-gifsicle@7.0.0:
@ -3112,6 +3148,7 @@ packages:
				@@ -3112,6 +3148,7 @@ packages:

  /is-what@3.14.1:
    resolution: {integrity: sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==}
+    dev: true

  /is-wsl@2.2.0:
    resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
@ -3187,6 +3224,7 @@ packages:
				@@ -3187,6 +3224,7 @@ packages:
      universalify: 2.0.1
    optionalDependencies:
      graceful-fs: 4.2.11
+    dev: true

  /junk@3.1.0:
    resolution: {integrity: sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==}
@ -3221,6 +3259,7 @@ packages:
				@@ -3221,6 +3259,7 @@ packages:
      source-map: 0.6.1
    transitivePeerDependencies:
      - supports-color
+    dev: true

  /load-json-file@1.1.0:
    resolution: {integrity: sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==}
@ -3338,6 +3377,7 @@ packages:
				@@ -3338,6 +3377,7 @@ packages:
    dependencies:
      pify: 4.0.1
      semver: 5.7.2
+    dev: true
    optional: true

  /make-dir@3.1.0:
@ -3411,6 +3451,7 @@ packages:
				@@ -3411,6 +3451,7 @@ packages:
    engines: {node: '>=4'}
    hasBin: true
    requiresBuild: true
+    dev: true
    optional: true

  /mimic-fn@2.1.0:
@ -3512,6 +3553,7 @@ packages:
				@@ -3512,6 +3553,7 @@ packages:
  /ms@2.1.3:
    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
    requiresBuild: true
+    dev: true
    optional: true

  /nanoid@3.3.6:
@ -3536,6 +3578,7 @@ packages:
				@@ -3536,6 +3578,7 @@ packages:
      sax: 1.3.0
    transitivePeerDependencies:
      - supports-color
+    dev: true
    optional: true

  /nice-try@1.0.5:
@ -3784,6 +3827,7 @@ packages:
				@@ -3784,6 +3827,7 @@ packages:
  /parse-node-version@1.0.1:
    resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==}
    engines: {node: '>= 0.10'}
+    dev: true

  /path-exists@2.1.0:
    resolution: {integrity: sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==}
@ -3859,6 +3903,7 @@ packages:
				@@ -3859,6 +3903,7 @@ packages:
    resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
    engines: {node: '>=6'}
    requiresBuild: true
+    dev: true

  /pinia@2.1.7(vue@3.4.21):
    resolution: {integrity: sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==}
@ -3962,6 +4007,7 @@ packages:
				@@ -3962,6 +4007,7 @@ packages:
  /prr@1.0.1:
    resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==}
    requiresBuild: true
+    dev: true
    optional: true

  /pseudomap@1.0.2:
@ -4144,6 +4190,7 @@ packages:
				@@ -4144,6 +4190,7 @@ packages:
    hasBin: true
    optionalDependencies:
      fsevents: 2.3.3
+    dev: true

  /run-parallel@1.2.0:
    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
@ -4162,11 +4209,13 @@ packages:
				@@ -4162,11 +4209,13 @@ packages:
  /safer-buffer@2.1.2:
    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
    requiresBuild: true
+    dev: true
    optional: true

  /sax@1.3.0:
    resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==}
    requiresBuild: true
+    dev: true
    optional: true

  /seek-bzip@1.0.6:
@ -4192,6 +4241,7 @@ packages:
				@@ -4192,6 +4241,7 @@ packages:
    resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
    hasBin: true
    requiresBuild: true
+    dev: true

  /semver@6.3.1:
    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
@ -4432,6 +4482,7 @@ packages:
				@@ -4432,6 +4482,7 @@ packages:
    engines: {node: '>=8'}
    dependencies:
      has-flag: 4.0.0
+    dev: true

  /supports-preserve-symlinks-flag@1.0.0:
    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
@ -4545,6 +4596,7 @@ packages:
				@@ -4545,6 +4596,7 @@ packages:

  /tslib@2.6.2:
    resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
+    dev: true

  /tunnel-agent@0.6.0:
    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
@ -4575,6 +4627,7 @@ packages:
				@@ -4575,6 +4627,7 @@ packages:
  /universalify@2.0.1:
    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
    engines: {node: '>= 10.0.0'}
+    dev: true

  /unplugin-combine@0.8.1(rollup@2.79.1)(vite@4.5.2):
    resolution: {integrity: sha512-m2OSmXXRwCPZx8Ct8eF8WbjgTo8bydim2W1ofu2hDabGdr2pgDAoFjOP1J4MOIwa0OByqk1JX8IGlSdeE6uxVQ==}
@ -4731,7 +4784,7 @@ packages:
				@@ -4731,7 +4784,7 @@ packages:
      vite: 4.5.2(less@4.1.3)
    transitivePeerDependencies:
      - supports-color
-    dev: false
+    dev: true

  /vite-plugin-imagemin@0.6.1(vite@4.5.2):
    resolution: {integrity: sha512-cP7LDn8euPrji7WYtDoNQpJEB9nkMxJHm/A+QZnvMrrCSuyo/clpMy/T1v7suDXPBavsDiDdFdVQB5p7VGD2cg==}
@ -4800,6 +4853,7 @@ packages:
				@@ -4800,6 +4853,7 @@ packages:
      rollup: 3.29.4
    optionalDependencies:
      fsevents: 2.3.3
+    dev: true

  /vue-demi@0.13.11(vue@3.4.21):
    resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==}
--- a/src/App.vue
+++ b/src/App.vue
@ -34,7 +34,6 @@ export default {
				@@ -34,7 +34,6 @@ export default {
  // watch $route 决定使用哪种过渡
  watch: {
    '$route'(to, from) {
-      // this.$store.commit('setMaskDialog', {state: false, mode: this.maskDialogMode})
      this.setMaskDialog({state: false, mode: this.maskDialogMode})

      //footer下面的5个按钮，对跳不要用动画
@ -68,7 +67,6 @@ export default {
				@@ -68,7 +67,6 @@ export default {
    // window.onresize = () => {
    //
    // }
-    // this.$store.dispatch('getFriends')
    try {
      navigator.control.gesture(false);
    } catch (e) {
--- a/src/components/slide/Indicator.vue
+++ b/src/components/slide/Indicator.vue
@ -1,8 +1,13 @@
				@@ -1,8 +1,13 @@
 <script lang="jsx">
 import bus from "../../utils/bus";
+import {useBaseStore} from "@/store/pinia";

 export default {
  name: "Indicator",
+  setup() {
+    const baseStore = useBaseStore()
+    return {baseStore}
+  },
  props: {
    activeIndex: {
      type: Number,
@ -97,7 +102,7 @@ export default {
				@@ -97,7 +102,7 @@ export default {
    move(e) {
      this.$setCss(this.indicatorRef, 'left',
          this.tabIndicatorRelationActiveIndexLefts[this.currentSlideItemIndex] -
-          e.x.distance / (this.$store.state.bodyWidth / this.indicatorSpace) + 'px')
+          e.x.distance / (this.baseStore.bodyWidth / this.indicatorSpace) + 'px')
    },
    end(index) {
      // console.log(index)
--- a/src/components/slide/IndicatorLight.vue
+++ b/src/components/slide/IndicatorLight.vue
@ -1,5 +1,6 @@
				@@ -1,5 +1,6 @@
 <script lang="jsx">
 import bus from "../../utils/bus";
+import {useBaseStore} from "@/store/pinia";

 export default {
  name: "IndicatorLight",
@ -33,6 +34,10 @@ export default {
				@@ -33,6 +34,10 @@ export default {
      indicatorSpace: 0,//indicator之间的间距
    }
  },
+  setup() {
+    const baseStore = useBaseStore()
+    return {baseStore}
+  },
  computed: {},
  render() {
    /*
@ -98,7 +103,7 @@ export default {
				@@ -98,7 +103,7 @@ export default {
    move(e) {
      this.$setCss(this.indicatorRef, 'left',
          this.tabIndicatorRelationActiveIndexLefts[this.currentSlideItemIndex] -
-          e.x.distance / (this.$store.state.bodyWidth / this.indicatorSpace) + 'px')
+          e.x.distance / (this.baseStore.bodyWidth / this.indicatorSpace) + 'px')
    },
    end(index) {
      // console.log(index)
--- a/src/components/slide/SlideRowList.vue
+++ b/src/components/slide/SlideRowList.vue
@ -17,6 +17,7 @@
				@@ -17,6 +17,7 @@
 <script>
 import bus from "../../utils/bus";
 import Loading from "../Loading";
+import {useBaseStore} from "@/store/pinia";

 export default {
  name: "BaseSlideList",
@ -53,6 +54,10 @@ export default {
				@@ -53,6 +54,10 @@ export default {
      default: () => ''
    },
  },
+  setup() {
+    const baseStore = useBaseStore()
+    return {baseStore}
+  },
  computed: {
    isHome() {
      return this.indicatorType === 'home'
@ -225,7 +230,7 @@ export default {
				@@ -225,7 +230,7 @@ export default {

        this.isHome && this.$setCss(this.indicatorRef, 'left',
            this.tabIndicatorRelationActiveIndexLefts[this.currentSlideItemIndex] -
-            this.moveXDistance / (this.$store.state.bodyWidth / this.indicatorSpace) + 'px')
+            this.moveXDistance / (this.baseStore.bodyWidth / this.indicatorSpace) + 'px')
      }
    },
    touchEnd(e) {
--- a/src/pages/home/components/IndicatorHome.vue
+++ b/src/pages/home/components/IndicatorHome.vue
@ -74,6 +74,10 @@ export default {
				@@ -74,6 +74,10 @@ export default {
      default: () => false
    }
  },
+  setup() {
+    const baseStore = useBaseStore()
+    return {baseStore}
+  },
  data() {
    return {
      indicatorRef: null,
@ -85,7 +89,7 @@ export default {
				@@ -85,7 +89,7 @@ export default {
    }
  },
  computed: {
-    ...mapState(useBaseStore,['judgeValue', 'homeRefresh']),
+    ...mapState(useBaseStore, ['judgeValue', 'homeRefresh']),
    tabOneClass() {
      return {active: this.index === 0, open: this.open}
    },
@ -143,6 +147,7 @@ export default {
				@@ -143,6 +147,7 @@ export default {
    bus.off(this.name + '-moveY',)
    bus.off(this.name + '-end', this.end)
  },
+
  methods: {
    toggleType(type) {
      if (type !== this.type) {
@ -178,7 +183,7 @@ export default {
				@@ -178,7 +183,7 @@ export default {
      this.$setCss(this.indicatorRef, 'transition-duration', `0ms`)
      this.$setCss(this.indicatorRef, 'left',
          this.lefts[this.index] -
-          e / (this.$store.state.bodyWidth / this.indicatorSpace) + 'px')
+          e / (this.baseStore.bodyWidth / this.indicatorSpace) + 'px')
    },
    end(index) {
      this.moveY = 0
--- a/src/pages/me/Me.vue
+++ b/src/pages/me/Me.vue
@ -426,16 +426,9 @@ export default {
				@@ -426,16 +426,9 @@ export default {
      acceleration: 1.2,
      sprint: 15,
      canScroll: true,
-      videoPoster: `?vframe/jpg/offset/0/w/${document.body.clientWidth}`
    }
  },
  computed: {
-    bodyHeight() {
-      return this.$store.state.bodyHeight
-    },
-    bodyWidth() {
-      return this.$store.state.bodyWidth
-    },
    videoSlideRowListStyle() {
      return {height: this.refs.videoSlideHeight !== 0 ? this.refs.videoSlideHeight + 'px' : 'calc(var(--vh, 1vh) * 100 - 146rem)'}
    },
@ -443,7 +436,7 @@ export default {
				@@ -443,7 +436,7 @@ export default {
      if (this.tempScroll || this.isScroll) return {overflow: 'auto'}
      return {overflow: 'hidden'}
    },
-    ...mapState(useBaseStore, ['userinfo'])
+    ...mapState(useBaseStore, ['userinfo', 'bodyHeight', 'bodyWidth'])
  },
  watch: {
    contentIndex(newVal, oldVal) {
--- a/src/pages/me/rightMenu/Setting.vue
+++ b/src/pages/me/rightMenu/Setting.vue
@ -183,11 +183,17 @@
				@@ -183,11 +183,17 @@
  </div>
 </template>
 <script>
+import {useBaseStore} from "@/store/pinia";
+
 export default {
  name: "Setting",
+  setup() {
+    const baseStore = useBaseStore()
+    return {baseStore}
+  },
  data() {
    return {
-      version: this.$store.state.version
+      version: this.baseStore.version
    }
  },
  computed: {},
--- a/src/pages/me/userinfo/AddSchool.vue
+++ b/src/pages/me/userinfo/AddSchool.vue
@ -68,7 +68,7 @@ export default {
				@@ -68,7 +68,7 @@ export default {
  data() {
    return {
      mitt: inject('mitt'),
-      localSchool: this.$clone(this.$store.state.userinfo.school),
+      localSchool: this.$clone(this.baseStore.userinfo.school),
      educationList: [
        {id: 1, name: '专科'},
        {id: 2, name: '本科'},
--- a/src/pages/message/SetRemark.vue
+++ b/src/pages/message/SetRemark.vue
@ -50,7 +50,6 @@ export default {
				@@ -50,7 +50,6 @@ export default {
    async save() {
      if (!this.isChanged) return
      this.$showLoading()
-      // this.$store.commit('setUserinfo', this.remark)
      await this.$sleep(500)
      this.$hideLoading()
      this.$back()
--- a/src/store/pinia.js
+++ b/src/store/pinia.js
@ -19,7 +19,7 @@ export const useBaseStore = defineStore('base', {
				@@ -19,7 +19,7 @@ export const useBaseStore = defineStore('base', {
      users: [],
      userinfo: {
        school: {
-          name: '中央戏剧学院',
+          name: '',
          department: null,
          joinTime: null,
          education: null,