From 842a3eb0c7ed07bf331a0fbb493938a78356361e Mon Sep 17 00:00:00 2001 From: sunnie <406803045@qq.com> Date: Mon, 1 Jun 2020 18:19:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8F=96layout=EF=BC=8C=EF=BC=8C?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BB=A3=E7=A0=81=E9=A3=8E=E6=A0=BC=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/user.js | 1 - src/assets/css/index.scss | 13 +++--- src/config/router.config.js | 41 ------------------- src/layouts/AppLayout.vue | 14 ------- src/main.js | 5 +-- src/router/index.js | 19 +++++---- src/router/router.config.js | 29 +++++++++++++ src/views/home/about.vue | 8 ++-- src/views/home/index.vue | 6 +-- .../layouts/index.vue} | 8 ++-- vue.config.js | 3 +- 11 files changed, 59 insertions(+), 88 deletions(-) delete mode 100644 src/config/router.config.js delete mode 100644 src/layouts/AppLayout.vue create mode 100644 src/router/router.config.js rename src/{layouts/TabBarLayout.vue => views/layouts/index.vue} (84%) diff --git a/src/api/user.js b/src/api/user.js index 9fbb466..7a0ebff 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -1,5 +1,4 @@ import api from './index' - // axios import request from '@/utils/request' diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss index 2f02a2f..b10fc34 100644 --- a/src/assets/css/index.scss +++ b/src/assets/css/index.scss @@ -1,14 +1,13 @@ @import './variables.scss'; @import './mixin.scss'; - + html, -body -.app { +body .app { color: #333333; font-family: Arial, Helvetica, 'STHeiti STXihei', 'Microsoft YaHei', Tohoma, sans-serif; background-color: $background-color; } - -.app-container{ - padding-bottom:50px; -} \ No newline at end of file + +.app-container { + padding-bottom: 50px; +} diff --git a/src/config/router.config.js b/src/config/router.config.js deleted file mode 100644 index 965aab9..0000000 --- a/src/config/router.config.js +++ /dev/null @@ -1,41 +0,0 @@ -/** - * 基础路由 - * @type { *[] } - */ -export const constantRouterMap = [ - { - path: '/', - name: 'index', - component: () => import('@/layouts/AppLayout'), - redirect: '/home', - meta: { - title: '首页', - keepAlive: false - }, - children: [ - { - path: '/', - component: () => import('@/layouts/TabBarLayout'), - redirect: '/home', - meta: { - title: '首页', - keepAlive: false - }, - children: [ - { - path: '/home', - name: 'Home', - component: () => import('@/views/home/index'), - meta: { title: '首页', keepAlive: false } - }, - { - path: '/about', - name: 'About', - component: () => import('@/views/home/about'), - meta: { title: '关于我', keepAlive: false } - } - ] - } - ] - } -] diff --git a/src/layouts/AppLayout.vue b/src/layouts/AppLayout.vue deleted file mode 100644 index faaa5b3..0000000 --- a/src/layouts/AppLayout.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - diff --git a/src/main.js b/src/main.js index c68384d..c014651 100644 --- a/src/main.js +++ b/src/main.js @@ -8,15 +8,14 @@ import App from './App.vue' import router from './router' import store from './store' -// 引入全局样式 -import '@/assets/css/index.scss' // 设置 js中可以访问 $cdn import { $cdn } from '@/config' Vue.prototype.$cdn = $cdn // 全局引入按需引入UI库 vant import '@/plugins/vant' - +// 引入全局样式 +import '@/assets/css/index.scss' // 移动端适配 import 'lib-flexible/flexible.js' diff --git a/src/router/index.js b/src/router/index.js index 7e9538c..f558712 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,27 +1,28 @@ import Vue from 'vue' import Router from 'vue-router' -import { constantRouterMap } from '@/config/router.config' +import { constantRouterMap } from './router.config.js' // hack router push callback const originalPush = Router.prototype.push -Router.prototype.push = function push (location, onResolve, onReject) { +Router.prototype.push = function push(location, onResolve, onReject) { if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject) return originalPush.call(this, location).catch(err => err) } Vue.use(Router) -const createRouter = () => new Router({ - mode: 'history', - base: process.env.BASE_URL, - scrollBehavior: () => ({ y: 0 }), - routes: constantRouterMap -}) +const createRouter = () => + new Router({ + mode: 'history', + base: process.env.BASE_URL, + scrollBehavior: () => ({ y: 0 }), + routes: constantRouterMap + }) const router = createRouter() // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465 -export function resetRouter () { +export function resetRouter() { const newRouter = createRouter() router.matcher = newRouter.matcher // reset router } diff --git a/src/router/router.config.js b/src/router/router.config.js new file mode 100644 index 0000000..8123140 --- /dev/null +++ b/src/router/router.config.js @@ -0,0 +1,29 @@ +/** + * 基础路由 + * @type { *[] } + */ +export const constantRouterMap = [ + { + path: '/', + component: () => import('@/views/layouts/index'), + redirect: '/home', + meta: { + title: '首页', + keepAlive: false + }, + children: [ + { + path: '/home', + name: 'Home', + component: () => import('@/views/home/index'), + meta: { title: '首页', keepAlive: false } + }, + { + path: '/about', + name: 'About', + component: () => import('@/views/home/about'), + meta: { title: '关于我', keepAlive: false } + } + ] + } +] diff --git a/src/views/home/about.vue b/src/views/home/about.vue index 28f33dd..7ca0bfd 100644 --- a/src/views/home/about.vue +++ b/src/views/home/about.vue @@ -1,6 +1,6 @@