diff --git a/package-lock.json b/package-lock.json index b321abf..ddcb79e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "layer-src": "^3.5.1", "vue": "^3.3.11", "vue-amazing-ui": "^0.1.38", - "vue-router": "^4.2.5", + "vue-router": "^4.4.2", "vue-scrollto": "^2.20.0", "vue3-layer": "^1.0.18", "vuex": "^4.0.2" @@ -855,9 +855,9 @@ } }, "node_modules/@vue/devtools-api": { - "version": "6.5.1", - "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.5.1.tgz", - "integrity": "sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==" + "version": "6.6.3", + "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.6.3.tgz", + "integrity": "sha512-0MiMsFma/HqA6g3KLKn+AGpL1kgKhFWszC9U29NfpWK5LE7bjeXxySWJrOJ77hBz+TBrBQ7o4QJqbPbqbs8rJw==" }, "node_modules/@vue/reactivity": { "version": "3.4.27", @@ -2622,11 +2622,14 @@ } }, "node_modules/vue-router": { - "version": "4.3.2", - "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.3.2.tgz", - "integrity": "sha512-hKQJ1vDAZ5LVkKEnHhmm1f9pMiWIBNGF5AwU67PdH7TyXCj/a4hTccuUuYCAMgJK6rO/NVYtQIEN3yL8CECa7Q==", + "version": "4.4.2", + "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.4.2.tgz", + "integrity": "sha512-1qNybkn2L7QsLzaXs8nvlQmRKp8XF8DCxZys/Jr1JpQcHsKUxTKzTxCVA1G7NfBfwRIBgCJPoujOG5lHCCNUxw==", "dependencies": { - "@vue/devtools-api": "^6.5.1" + "@vue/devtools-api": "^6.6.3" + }, + "funding": { + "url": "https://github.com/sponsors/posva" }, "peerDependencies": { "vue": "^3.2.0" diff --git a/package.json b/package.json index 2fd0c7c..3da5990 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "layer-src": "^3.5.1", "vue": "^3.3.11", "vue-amazing-ui": "^0.1.38", - "vue-router": "^4.2.5", + "vue-router": "^4.4.2", "vue-scrollto": "^2.20.0", "vue3-layer": "^1.0.18", "vuex": "^4.0.2" diff --git a/src/App.vue b/src/App.vue index a47cbf7..bdbbd30 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,7 +4,7 @@ - + @@ -32,6 +32,47 @@ export default { }, + // watch: { + // // 监听路由变化 + // $route(to, from) { + // if (to.name === 'Home' && from.name === 'Home') { + // // 如果从首页路由离开并再次返回,重置飘窗状态 + // this.sportStatus = false; + // this.floatWindowKey = 0; + // this.clearFloatWindowTimer(); // 清除飘窗的定时器 + // this.resetFloatWindowPosition(); // 重置飘窗位置 + // console.log(22); + // } else if (to.name === 'Home') { + // // 如果第一次进入首页路由,启动飘窗 + // this.sportStatus = true; + // this.floatWindowKey++; // 增加 key 值以强制重新渲染 + // console.log(11); + // this.resetFloatWindowPosition(); // 重置飘窗位置 + // this.startFloatWindowTimer(); // 启动飘窗移动的定时器 + // } + // } + // }, + + // data() { + // return { + // shouldReloadHome: false // 标志,用于判断是否需要刷新首页 + // }; + // }, + // methods: { + // handleRefreshHome() { + // this.shouldReloadHome = true; // 设置刷新标志 + // } + // }, + // watch: { + // $route(to, from) { + // // 当路由跳转到首页且设置了刷新标志时,刷新页面 + // if (to.path === '/' && this.shouldReloadHome) { + // window.location.reload(); // 刷新页面 + // this.shouldReloadHome = false; // 重置刷新标志 + // } + // } + // } + } diff --git a/src/components/Footer.vue b/src/components/Footer.vue index 58e3216..f5d1b9e 100644 --- a/src/components/Footer.vue +++ b/src/components/Footer.vue @@ -3,7 +3,8 @@
diff --git a/src/components/HeaderNav.vue b/src/components/HeaderNav.vue index 4c4f618..5359ff6 100644 --- a/src/components/HeaderNav.vue +++ b/src/components/HeaderNav.vue @@ -2,14 +2,16 @@