From d0a94d85bf9d42514919b9d6fee49057341c03c5 Mon Sep 17 00:00:00 2001
From: jundayw <jundayw@126.com>
Date: Wed, 25 Oct 2023 20:17:47 +0800
Subject: [PATCH] wip

---
 src/config/config.js                 | 8 --------
 src/config/default/setting.config.js | 6 +++---
 src/layouts/footer/PageFooter.vue    | 4 ++--
 src/router/index.js                  | 5 ++++-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/config/config.js b/src/config/config.js
index c42ec3b..6bb1c8e 100644
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -1,12 +1,4 @@
 // 自定义配置，参考 ./default/setting.config.js，需要自定义的属性在这里配置即可
 module.exports = {
-  theme: {
-    color: '#13c2c2',
-    mode: 'dark',
-  },
   multiPage: true,
-  animate: {
-    name: 'lightSpeed',
-    direction: 'left'
-  }
 }
diff --git a/src/config/default/setting.config.js b/src/config/default/setting.config.js
index 19e736a..71f7242 100644
--- a/src/config/default/setting.config.js
+++ b/src/config/default/setting.config.js
@@ -8,8 +8,8 @@ module.exports = {
     warning: '#faad14',                 //警告色
     error: '#f5222f',                   //错误色
   },
-  layout: 'side',                       //导航布局，可选 side 和 head，分别为侧边导航和顶部导航
-  fixedHeader: false,                   //固定头部状态栏，true:固定，false:不固定
+  layout: 'mix',                       //导航布局，可选 side 和 head，分别为侧边导航和顶部导航
+  fixedHeader: true,                   //固定头部状态栏，true:固定，false:不固定
   fixedSideBar: true,                   //固定侧边栏，true:固定，false:不固定
   fixedTabs: false,                      //固定页签头，true:固定，false:不固定
   pageWidth: 'fixed',                   //内容区域宽度，fixed:固定宽度，fluid:流式宽度
@@ -24,7 +24,7 @@ module.exports = {
   filterMenu: true,                    //根据权限过滤菜单，true:过滤，false:不过滤
   animate: {                            //动画设置
     disabled: false,                    //禁用动画，true:禁用，false:启用
-    name: 'bounce',                     //动画效果，支持的动画效果可参考 ./animate.config.js
+    name: 'slide',                     //动画效果，支持的动画效果可参考 ./animate.config.js
     direction: 'left'                   //动画方向，切换页面时动画的方向，参考 ./animate.config.js
   },
   footerLinks: [                        //页面底部链接，{link: '链接地址', name: '名称/显示文字', icon: '图标，支持 ant design vue 图标库'}
diff --git a/src/layouts/footer/PageFooter.vue b/src/layouts/footer/PageFooter.vue
index 7c0d079..81bfbc9 100644
--- a/src/layouts/footer/PageFooter.vue
+++ b/src/layouts/footer/PageFooter.vue
@@ -6,7 +6,7 @@
       </a>
     </div>
     <div class="copyright">
-      Copyright<a-icon type="copyright" />{{copyright}}
+      Copyright &copy; {{copyright}}
     </div>
   </div>
 </template>
@@ -33,7 +33,7 @@ export default {
     .links{
       margin-bottom: 8px;
       a:not(:last-child) {
-        margin-right: 40px;
+        margin:auto 5px;
       }
       a{
         color: @text-color-second;
diff --git a/src/router/index.js b/src/router/index.js
index c5aa144..e39e9b0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 import {formatRoutes} from '@/utils/routerUtil'
+import deepmerge from "deepmerge";
 
 Vue.use(Router)
 
@@ -26,6 +27,8 @@ const loginIgnore = {
 function initRouter(isAsync) {
   const options = isAsync ? require('./async/config.async').default : require('./config').default
   formatRoutes(options.routes)
-  return new Router(options)
+  return new Router(deepmerge(options, {
+    mode: 'history',
+  }));
 }
 export {loginIgnore, initRouter}