diff --git a/src/assets/images/loginBg.png b/src/assets/images/loginBg.png new file mode 100644 index 0000000..8f90586 Binary files /dev/null and b/src/assets/images/loginBg.png differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png index ad01042..b3fdd44 100644 Binary files a/src/assets/images/logo.png and b/src/assets/images/logo.png differ diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue deleted file mode 100644 index 879051a..0000000 --- a/src/components/HelloWorld.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - diff --git a/src/components/table/index.vue b/src/components/table/index.vue new file mode 100644 index 0000000..227d15d --- /dev/null +++ b/src/components/table/index.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/src/main.js b/src/main.js index 52a96e4..36fe0ab 100644 --- a/src/main.js +++ b/src/main.js @@ -17,6 +17,16 @@ Vue.use(mixins); import store from "@/store"; import router from "@/permission"; Vue.config.productionTip = false +import commonTable from './components/table' + +// 注册组件 +Vue.component('commonTable', commonTable) + +router.beforeEach((to, from, next) => { + // 让页面回到顶部 + document.documentElement.scrollTop = 0 + next() +}) new Vue({ render: h => h(App), diff --git a/src/permission.js b/src/permission.js index 39af6dc..f83558e 100644 --- a/src/permission.js +++ b/src/permission.js @@ -18,9 +18,5 @@ router.beforeEach((to, from, next) => { router.afterEach(() => { NProgress.done() }) -// router.beforeEach((to, from, next) => { -// // 让页面回到顶部 -// document.documentElement.scrollTop = 0 -// next() -// }) + export default router \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index a3bf684..2c61695 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -43,7 +43,7 @@ export default new Router({ mode: 'history', routes: router, scrollBehavior(to, from, savedPosition) { - console.log(savedPosition); + // console.log(savedPosition); if (savedPosition) { return new Promise((resolve) => { setTimeout(() => { diff --git a/src/styles/index.less b/src/styles/index.less index 80820dc..6f61933 100644 --- a/src/styles/index.less +++ b/src/styles/index.less @@ -1,13 +1,24 @@ @import "./antd.less"; +// 公共样式 +#app{ + background: #E5E5E5; +} .content{ padding: 13px; } +.main{ + padding: 13px; + background: #fff; +} .cardTitle{ border-left: 8px solid #205FBD; padding-left:10px; margin-left: 10px; margin-bottom: 10px; } -#app{ - background: #E5E5E5; +#commonTable{ + margin: 24px; +} +.search-box { + margin: 30px; } \ No newline at end of file diff --git a/src/views/Login/index.vue b/src/views/Login/index.vue index a6750b1..86b764d 100644 --- a/src/views/Login/index.vue +++ b/src/views/Login/index.vue @@ -7,18 +7,18 @@ * @FilePath: /ansu-business/src/views/Login/index.vue -->