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 @@