diff --git a/package.json b/package.json index 75e81bb0..933c51ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "SCUI-Admin", - "version": "1.1.1", + "version": "1.1.2", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/config/index.js b/src/config/index.js index 4dc37434..a65d1220 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -3,7 +3,7 @@ const DEFAULT_CONFIG = { APP_NAME: "SCUI", //版本号 - APP_VER: "1.1.1", + APP_VER: "1.1.2", //接口地址 API_URL: "", @@ -11,6 +11,12 @@ const DEFAULT_CONFIG = { //MOCK接口地址 MOCK_URL: "https://www.fastmock.site/mock/44c807475f7eeba73409792255781935/api", + //布局 默认:default | 通栏:header + LAYOUT: 'default', + + //菜单是否折叠 + MENU_IS_COLLAPSE: false, + //是否开启多标签 LAYOUT_TAGS: true, diff --git a/src/layout/components/NavMenu.vue b/src/layout/components/NavMenu.vue index dd91dc5c..d30e97f8 100644 --- a/src/layout/components/NavMenu.vue +++ b/src/layout/components/NavMenu.vue @@ -6,12 +6,14 @@ - {{navMenu.meta.title}} + diff --git a/src/layout/components/head.vue b/src/layout/components/head.vue deleted file mode 100644 index f043bcd1..00000000 --- a/src/layout/components/head.vue +++ /dev/null @@ -1,128 +0,0 @@ - - - diff --git a/src/layout/components/setting.vue b/src/layout/components/setting.vue new file mode 100644 index 00000000..9403ec0d --- /dev/null +++ b/src/layout/components/setting.vue @@ -0,0 +1,45 @@ + + + + + diff --git a/src/layout/components/side.vue b/src/layout/components/side.vue deleted file mode 100644 index 1f3d8d55..00000000 --- a/src/layout/components/side.vue +++ /dev/null @@ -1,90 +0,0 @@ - - - diff --git a/src/layout/components/topbar.vue b/src/layout/components/topbar.vue new file mode 100644 index 00000000..9a2c0f7e --- /dev/null +++ b/src/layout/components/topbar.vue @@ -0,0 +1,42 @@ + + + diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue new file mode 100644 index 00000000..3d77b626 --- /dev/null +++ b/src/layout/components/userbar.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/src/layout/index.vue b/src/layout/index.vue index 19be62d2..25e44acb 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -1,44 +1,147 @@ - - diff --git a/src/views/template/list.vue b/src/views/template/list.vue deleted file mode 100644 index e8d2be24..00000000 --- a/src/views/template/list.vue +++ /dev/null @@ -1,269 +0,0 @@ - - - diff --git a/src/views/template/show.vue b/src/views/template/show.vue deleted file mode 100644 index dac92d50..00000000 --- a/src/views/template/show.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - - - diff --git a/src/views/template/sideList.vue b/src/views/template/sideList.vue deleted file mode 100644 index cd87a25b..00000000 --- a/src/views/template/sideList.vue +++ /dev/null @@ -1,127 +0,0 @@ - - - - -