From a0a6d195617dd663133631989423d1dcc30cd6dd Mon Sep 17 00:00:00 2001 From: zyronon Date: Wed, 27 Mar 2024 18:00:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4vuex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +- pnpm-lock.yaml | 12 -- src/App.vue | 11 +- src/components/Comment.vue | 5 +- src/components/Share.vue | 5 +- src/components/UserPanel.vue | 9 +- .../slide/SlideVerticalInfinite.vue | 12 +- src/main.js | 2 - src/pages/home/Publish.vue | 5 +- src/pages/home/components/IndicatorHome.vue | 5 +- src/pages/home/components/ShareTo.vue | 11 +- src/pages/home/components/ShareToFriend.vue | 5 +- src/pages/home/components/VideoShare.vue | 7 +- src/pages/home/index.vue | 12 +- src/pages/home/slide/LongVideo.vue | 20 ++-- src/pages/home/slide/SlideList.vue | 21 ++-- src/pages/me/Me.vue | 10 +- src/pages/me/MyCard.vue | 11 +- src/pages/me/MyMusic.vue | 5 +- src/pages/me/MyRequestUpdate.vue | 5 +- src/pages/me/RequestUpdate.vue | 5 +- src/pages/me/collect/MusicCollect.vue | 5 +- src/pages/me/userinfo/AddSchool.vue | 19 +-- src/pages/me/userinfo/ChooseCity.vue | 13 ++- src/pages/me/userinfo/ChooseDepartment.vue | 2 - src/pages/me/userinfo/ChooseLocation.vue | 16 ++- src/pages/me/userinfo/EditUserInfo.vue | 52 ++++++--- src/pages/me/userinfo/EditUserInfoItem.vue | 22 ++-- src/pages/message/AllMessage.vue | 11 +- src/pages/message/Fans.vue | 108 ++++++++---------- src/pages/message/Message.vue | 10 +- src/pages/message/MoreSearch.vue | 5 +- src/pages/message/RedPacketDetail.vue | 10 +- src/pages/message/SetRemark.vue | 2 - src/pages/message/Visitors.vue | 9 +- src/pages/message/chat/Chat.vue | 9 +- src/pages/message/components/ChatMessage.vue | 7 +- src/pages/people/FindAcquaintance.vue | 5 +- src/pages/people/FollowAndFans.vue | 5 +- src/router/index.js | 12 +- src/store/index.js | 90 --------------- src/store/pinia.js | 37 +++++- src/utils/index.jsx | 6 + src/utils/request.js | 1 - stats.html | 2 +- 45 files changed, 304 insertions(+), 335 deletions(-) delete mode 100644 src/store/index.js diff --git a/package.json b/package.json index a590804..1ec7033 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,7 @@ "vue": "3.4.21", "vue-masonry": "0.16.0", "vue-router": "4.3.0", - "vue-switches": "2.0.1", - "vuex": "4.1.0" + "vue-switches": "2.0.1" }, "devDependencies": { "@iconify/vue": "^4.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b2993b6..0e1c8ea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -50,9 +50,6 @@ dependencies: vue-switches: specifier: 2.0.1 version: 2.0.1 - vuex: - specifier: 4.1.0 - version: 4.1.0(vue@3.4.21) devDependencies: '@iconify/vue': @@ -4887,15 +4884,6 @@ packages: '@vue/server-renderer': 3.4.21(vue@3.4.21) '@vue/shared': 3.4.21 - /vuex@4.1.0(vue@3.4.21): - resolution: {integrity: sha512-hmV6UerDrPcgbSy9ORAtNXDr9M4wlNP4pEFKye4ujJF8oqgFFuxDCdOLS3eNoRTtq5O3hoBDh9Doj1bQMYHRbQ==} - peerDependencies: - vue: ^3.2.0 - dependencies: - '@vue/devtools-api': 6.5.1 - vue: 3.4.21 - dev: false - /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} requiresBuild: true diff --git a/src/App.vue b/src/App.vue index 3caa746..7aea995 100644 --- a/src/App.vue +++ b/src/App.vue @@ -13,12 +13,10 @@ * try {navigator.control.gesture(false);} catch (e) {} //UC浏览器关闭默认手势事件 try {navigator.control.longpressMenu(false);} catch (e) {} //关闭长按弹出菜单 * */ -import {mapState} from "vuex"; +import {mapActions, mapState} from "pinia"; import routes from "./router/routes"; import Call from "./components/Call"; import {useBaseStore} from "@/store/pinia"; -import {mapActions} from 'pinia' - export default { name: 'App', @@ -31,12 +29,13 @@ export default { } }, computed: { - ...mapState(['excludeRoutes']), + ...mapState(useBaseStore, ['excludeRoutes']), }, // watch $route 决定使用哪种过渡 watch: { '$route'(to, from) { - this.$store.commit('setMaskDialog', {state: false, mode: this.maskDialogMode}) + // this.$store.commit('setMaskDialog', {state: false, mode: this.maskDialogMode}) + this.setMaskDialog({state: false, mode: this.maskDialogMode}) //footer下面的5个按钮,对跳不要用动画 let noAnimation = ['/', '/home', '/slide', '/me', '/shop', '/message', '/publish', '/home/live', @@ -52,7 +51,7 @@ export default { }, }, methods: { - ...mapActions(useBaseStore, ['init']), + ...mapActions(useBaseStore, ['init', 'setMaskDialog']), setVh() { let vh = window.innerHeight * 0.01 document.documentElement.style.setProperty('--vh', `${vh}px`) diff --git a/src/components/Comment.vue b/src/components/Comment.vue index db5d217..48f36f2 100644 --- a/src/components/Comment.vue +++ b/src/components/Comment.vue @@ -125,11 +125,12 @@