diff --git a/package.json b/package.json index 927d3f4..6d0fe1e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ }, "dependencies": { "axios": "^1.1.2", - "core-js": "3.6.5", "element-ui": "2.13.2", "js-cookie": "2.2.0", "normalize.css": "7.0.0", diff --git a/src/api/user.js b/src/api/user.js index b1f656c..2881385 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -16,6 +16,7 @@ export function login(datas) { }) } +// 获取目录和文件数据 export function mirlist(datas) { return request({ url: '/api/ls', diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index db71d69..2a31347 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -90,7 +90,7 @@ export default { // } newMenu = { path: '/subfile?id='+item.id, - meta: { title: item.directory, icon: 'dashboard' }, + meta: { title: item.directory }, class: 'file', children:[] } diff --git a/src/router/index.js b/src/router/index.js index ac7e9b0..8a362be 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -62,7 +62,7 @@ export const constantRoutes = [ path: 'filemange', name: 'filemange', component: () => import('@/views/filemange/index'), - meta: { title: '文件管理', icon: 'dashboard' } + meta: { title: '', icon: 'dashboard' } }, { path: 'subfile', diff --git a/src/settings.js b/src/settings.js index 1ca4f26..a2bfe9e 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,6 +1,7 @@ module.exports = { title: '嘉洛马', + address: 'http://192.168.0.100', /** * @type {boolean} true | false diff --git a/src/styles/index.scss b/src/styles/index.scss index 3b4da51..7dcabab 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -4,13 +4,13 @@ @import './element-ui.scss'; @import './sidebar.scss'; -body { - height: 100%; - -moz-osx-font-smoothing: grayscale; - -webkit-font-smoothing: antialiased; - text-rendering: optimizeLegibility; - font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; -} +// body { +// height: 100%; +// -moz-osx-font-smoothing: grayscale; +// -webkit-font-smoothing: antialiased; +// text-rendering: optimizeLegibility; +// font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; +// } label { font-weight: 700; diff --git a/src/views/login/index.vue b/src/views/login/index.vue index d5ea54d..d3689ae 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -192,6 +192,7 @@ export default { message: error, type: 'error' }); + this.loading = false }); } else { console.log('error submit!!') @@ -259,7 +260,7 @@ $cursor: #3c3535; position: relative; width: 520px; max-width: 100%; - padding:0 35px 0 35px; + padding:0 32px 0 32px; margin: 160px auto 0 auto; overflow: hidden; } diff --git a/src/views/subfile/index.vue b/src/views/subfile/index.vue index 34a6c1c..1f88de0 100644 --- a/src/views/subfile/index.vue +++ b/src/views/subfile/index.vue @@ -1,74 +1,89 @@