From ea1a8cf41c11f8f533cea594e1f1c03640cf4a96 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 16:26:28 +0800
Subject: [PATCH] 合并冲突

---
 src/router/router.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/router/router.js b/src/router/router.js
index 35ea479..8ccaeca 100644
--- a/src/router/router.js
+++ b/src/router/router.js
@@ -8,7 +8,7 @@
 //鍒涘缓璺敱
 const createRouter = () => {
   return new VueRouter({
-    mode: 'history',
+    // mode: 'history',
     scrollBehavior (to, from, savedPosition) {
       if (savedPosition) {
         return savedPosition

--
Gitblit v1.9.3