diff --git a/admin/.vscode/extensions.json b/admin/.vscode/extensions.json index a7cea0b..ef2ad2d 100644 --- a/admin/.vscode/extensions.json +++ b/admin/.vscode/extensions.json @@ -1,3 +1,3 @@ { - "recommendations": ["Vue.volar"] + "recommendations": ["vue.volar", "cnblogs.vscode-cnb"] } diff --git a/admin/index.html b/admin/index.html index 795e4fb..812fdea 100644 --- a/admin/index.html +++ b/admin/index.html @@ -2,9 +2,9 @@ - + - Vite + Vue + 后台管理
diff --git a/admin/package-lock.json b/admin/package-lock.json index 2983dc1..9293e13 100644 --- a/admin/package-lock.json +++ b/admin/package-lock.json @@ -13,6 +13,7 @@ "axios": "^1.1.3", "element-plus": "^2.2.19", "pinia": "^2.0.23", + "pinia-plugin-persist": "^1.0.0", "prismjs": "^1.29.0", "screenfull": "^6.0.2", "vue": "^3.2.41", @@ -4720,6 +4721,46 @@ } } }, + "node_modules/pinia-plugin-persist": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/pinia-plugin-persist/-/pinia-plugin-persist-1.0.0.tgz", + "integrity": "sha512-M4hBBd8fz/GgNmUPaaUsC29y1M09lqbXrMAHcusVoU8xlQi1TqgkWnnhvMikZwr7Le/hVyMx8KUcumGGrR6GVw==", + "dependencies": { + "vue-demi": "^0.12.1" + }, + "peerDependencies": { + "@vue/composition-api": "^1.0.0", + "pinia": "^2.0.0", + "vue": "^2.0.0 || >=3.0.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + } + } + }, + "node_modules/pinia-plugin-persist/node_modules/vue-demi": { + "version": "0.12.5", + "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.12.5.tgz", + "integrity": "sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==", + "hasInstallScript": true, + "bin": { + "vue-demi-fix": "bin/vue-demi-fix.js", + "vue-demi-switch": "bin/vue-demi-switch.js" + }, + "engines": { + "node": ">=12" + }, + "peerDependencies": { + "@vue/composition-api": "^1.0.0-rc.1", + "vue": "^3.0.0-0 || ^2.6.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + } + } + }, "node_modules/pinia/node_modules/vue-demi": { "version": "0.13.11", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.11.tgz", @@ -9645,6 +9686,22 @@ } } }, + "pinia-plugin-persist": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/pinia-plugin-persist/-/pinia-plugin-persist-1.0.0.tgz", + "integrity": "sha512-M4hBBd8fz/GgNmUPaaUsC29y1M09lqbXrMAHcusVoU8xlQi1TqgkWnnhvMikZwr7Le/hVyMx8KUcumGGrR6GVw==", + "requires": { + "vue-demi": "^0.12.1" + }, + "dependencies": { + "vue-demi": { + "version": "0.12.5", + "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.12.5.tgz", + "integrity": "sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==", + "requires": {} + } + } + }, "posix-character-classes": { "version": "0.1.1", "resolved": "https://registry.npmmirror.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz", diff --git a/admin/package.json b/admin/package.json index 4aa7907..cd7f8c5 100644 --- a/admin/package.json +++ b/admin/package.json @@ -14,6 +14,7 @@ "axios": "^1.1.3", "element-plus": "^2.2.19", "pinia": "^2.0.23", + "pinia-plugin-persist": "^1.0.0", "prismjs": "^1.29.0", "screenfull": "^6.0.2", "vue": "^3.2.41", diff --git a/admin/src/assets/logo.png b/admin/src/assets/logo.png new file mode 100644 index 0000000..67995d7 Binary files /dev/null and b/admin/src/assets/logo.png differ diff --git a/admin/src/assets/scss/element.scss b/admin/src/assets/scss/element.scss index 85d1f8a..8398e4e 100644 --- a/admin/src/assets/scss/element.scss +++ b/admin/src/assets/scss/element.scss @@ -10,4 +10,5 @@ .el-header { --el-header-padding: none; + height: 84px; } \ No newline at end of file diff --git a/admin/src/assets/scss/index.scss b/admin/src/assets/scss/index.scss index 69f6af0..2ec0d04 100644 --- a/admin/src/assets/scss/index.scss +++ b/admin/src/assets/scss/index.scss @@ -8,5 +8,5 @@ #app { height: 100vh; - // font-family: 'Times New Roman', '仿宋'; + font-family: 'Times New Roman', '仿宋'; } \ No newline at end of file diff --git a/admin/src/layout/components/Header.vue b/admin/src/layout/components/Header.vue new file mode 100644 index 0000000..f950376 --- /dev/null +++ b/admin/src/layout/components/Header.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/admin/src/layout/menu/Menu.vue b/admin/src/layout/components/Menu.vue similarity index 95% rename from admin/src/layout/menu/Menu.vue rename to admin/src/layout/components/Menu.vue index 0e1bb83..5647c80 100644 --- a/admin/src/layout/menu/Menu.vue +++ b/admin/src/layout/components/Menu.vue @@ -4,13 +4,13 @@ background-color="#304156" :default-active="$router.currentRoute.value.path" text-color="#fff" - unique-opened="true" + :unique-opened="true" :collapse="store.collapse" - router="true" + :router="true" class="side-nav-bar" > - + 首页 diff --git a/admin/src/layout/header/components/Avatar.vue b/admin/src/layout/header/components/Avatar.vue deleted file mode 100644 index a2ca988..0000000 --- a/admin/src/layout/header/components/Avatar.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - - - diff --git a/admin/src/layout/header/components/Hamburger.vue b/admin/src/layout/header/components/Hamburger.vue deleted file mode 100644 index 8997b1e..0000000 --- a/admin/src/layout/header/components/Hamburger.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - - - diff --git a/admin/src/layout/header/components/Screenfull.vue b/admin/src/layout/header/components/Screenfull.vue deleted file mode 100644 index 0de5ac9..0000000 --- a/admin/src/layout/header/components/Screenfull.vue +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/admin/src/layout/header/index.vue b/admin/src/layout/header/index.vue deleted file mode 100644 index 987713a..0000000 --- a/admin/src/layout/header/index.vue +++ /dev/null @@ -1,40 +0,0 @@ - - - - - diff --git a/admin/src/layout/index.vue b/admin/src/layout/index.vue index d22d169..33b752d 100644 --- a/admin/src/layout/index.vue +++ b/admin/src/layout/index.vue @@ -6,17 +6,22 @@
- + + + + + +