diff --git a/src/assets/images/about-bg.png b/src/assets/images/about-bg.png new file mode 100644 index 0000000..1db717b Binary files /dev/null and b/src/assets/images/about-bg.png differ diff --git a/src/assets/images/about.png b/src/assets/images/about.png new file mode 100644 index 0000000..6e71398 Binary files /dev/null and b/src/assets/images/about.png differ diff --git a/src/assets/images/arrow.png b/src/assets/images/arrow.png new file mode 100644 index 0000000..a88986c Binary files /dev/null and b/src/assets/images/arrow.png differ diff --git a/src/assets/images/channel-bg.png b/src/assets/images/channel-bg.png new file mode 100644 index 0000000..fbe6c85 Binary files /dev/null and b/src/assets/images/channel-bg.png differ diff --git a/src/assets/images/channel1.png b/src/assets/images/channel1.png new file mode 100644 index 0000000..748c272 Binary files /dev/null and b/src/assets/images/channel1.png differ diff --git a/src/assets/images/channel2.png b/src/assets/images/channel2.png new file mode 100644 index 0000000..8bc0aa3 Binary files /dev/null and b/src/assets/images/channel2.png differ diff --git a/src/assets/images/iasf.png b/src/assets/images/iasf.png new file mode 100644 index 0000000..d19b092 Binary files /dev/null and b/src/assets/images/iasf.png differ diff --git a/src/assets/images/info-bg.png b/src/assets/images/info-bg.png new file mode 100644 index 0000000..81e2095 Binary files /dev/null and b/src/assets/images/info-bg.png differ diff --git a/src/layouts/footer/index.vue b/src/layouts/footer/index.vue index 62a1b87..c29a016 100644 --- a/src/layouts/footer/index.vue +++ b/src/layouts/footer/index.vue @@ -1,56 +1,97 @@ \ No newline at end of file diff --git a/src/layouts/home/index.vue b/src/layouts/home/index.vue index 8bdfd0c..2936233 100644 --- a/src/layouts/home/index.vue +++ b/src/layouts/home/index.vue @@ -1,12 +1,12 @@ @@ -19,7 +19,7 @@ import vFooter from "../footer"; export default { data() { return { - + isChannel: this.$route.query.path === '/channel' }; }, components: { @@ -48,13 +48,10 @@ export default { }; \ No newline at end of file diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue new file mode 100644 index 0000000..bc15c44 --- /dev/null +++ b/src/pages/article/index.vue @@ -0,0 +1,229 @@ + + + + + \ No newline at end of file diff --git a/src/pages/channel/index.vue b/src/pages/channel/index.vue index bc15c44..e277d29 100644 --- a/src/pages/channel/index.vue +++ b/src/pages/channel/index.vue @@ -1,86 +1,162 @@ \ No newline at end of file diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue deleted file mode 100644 index 9605a2d..0000000 --- a/src/pages/index/list/index.vue +++ /dev/null @@ -1,25 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/router/modules/article.js b/src/router/modules/article.js new file mode 100644 index 0000000..2559cbb --- /dev/null +++ b/src/router/modules/article.js @@ -0,0 +1,14 @@ +import BasicLayout from '@/layouts/home' +const name = 'article' +export default { + path: `/${name}`, + component: BasicLayout, + children: [ + { + name, + path: `/${name}`, + component: () => import(`@/pages/${name}`), + meta: { title: '' } + } + ] +}; diff --git a/src/router/modules/index.js b/src/router/modules/index.js deleted file mode 100644 index 00c357a..0000000 --- a/src/router/modules/index.js +++ /dev/null @@ -1,14 +0,0 @@ -import BasicLayout from '@/layouts/home'; - -export default { - path: '/index', - component: BasicLayout, - children: [ - { - name: `index`, - path: `/index`, - component: () => import('@/pages/index/list'), - meta: { title: '首页' } - }, - ] -}; diff --git a/src/setting.js b/src/setting.js index b4168c4..65df91b 100644 --- a/src/setting.js +++ b/src/setting.js @@ -6,7 +6,7 @@ let host = `${location.origin}:10000/` if (isDev) { host = 'http://192.168.31.136:10000/' // 测试服 - // host = 'http://192.168.31.151:10000/' // 榕 + host = 'http://192.168.31.51:10000/' // 榕 // host = 'http://192.168.31.137:10000/' // 赓 }