提交 a4071a3a authored 作者: lihuihui's avatar lihuihui

Merge branch 'master' of https://gitlab.ezijing.com/webapp/ezijing-www-pc

# Conflicts: # .nuxt/router.js # package-lock.json
...@@ -9,8 +9,6 @@ export { default as AboutDetail } from '../../components/about/detail.vue' ...@@ -9,8 +9,6 @@ export { default as AboutDetail } from '../../components/about/detail.vue'
export { default as AboutIntroduce } from '../../components/about/introduce.vue' export { default as AboutIntroduce } from '../../components/about/introduce.vue'
export { default as AboutNews } from '../../components/about/news.vue' export { default as AboutNews } from '../../components/about/news.vue'
export { default as AboutTabNav } from '../../components/about/tabNav.vue' export { default as AboutTabNav } from '../../components/about/tabNav.vue'
export { default as AlumnusParty } from '../../components/alumnus/party.vue'
export { default as AlumnusTabNav } from '../../components/alumnus/tabNav.vue'
export { default as HomeAlumniStories } from '../../components/home/alumniStories.vue' export { default as HomeAlumniStories } from '../../components/home/alumniStories.vue'
export { default as HomeBanner } from '../../components/home/banner.vue' export { default as HomeBanner } from '../../components/home/banner.vue'
export { default as HomeDegreeEducation } from '../../components/home/degreeEducation.vue' export { default as HomeDegreeEducation } from '../../components/home/degreeEducation.vue'
...@@ -19,6 +17,8 @@ export { default as HomeHeadmasterMsg } from '../../components/home/headmasterMs ...@@ -19,6 +17,8 @@ export { default as HomeHeadmasterMsg } from '../../components/home/headmasterMs
export { default as HomeOpenClass } from '../../components/home/openClass.vue' export { default as HomeOpenClass } from '../../components/home/openClass.vue'
export { default as HomeProjectNotice } from '../../components/home/projectNotice.vue' export { default as HomeProjectNotice } from '../../components/home/projectNotice.vue'
export { default as HomeServiceCase } from '../../components/home/serviceCase.vue' export { default as HomeServiceCase } from '../../components/home/serviceCase.vue'
export { default as AlumnusParty } from '../../components/alumnus/party.vue'
export { default as AlumnusTabNav } from '../../components/alumnus/tabNav.vue'
export const LazyFoot = import('../../components/Foot.vue' /* webpackChunkName: "components/foot" */).then(c => wrapFunctional(c.default || c)) export const LazyFoot = import('../../components/Foot.vue' /* webpackChunkName: "components/foot" */).then(c => wrapFunctional(c.default || c))
export const LazyHead = import('../../components/Head.vue' /* webpackChunkName: "components/head" */).then(c => wrapFunctional(c.default || c)) export const LazyHead = import('../../components/Head.vue' /* webpackChunkName: "components/head" */).then(c => wrapFunctional(c.default || c))
...@@ -29,8 +29,6 @@ export const LazyAboutDetail = import('../../components/about/detail.vue' /* web ...@@ -29,8 +29,6 @@ export const LazyAboutDetail = import('../../components/about/detail.vue' /* web
export const LazyAboutIntroduce = import('../../components/about/introduce.vue' /* webpackChunkName: "components/about-introduce" */).then(c => wrapFunctional(c.default || c)) export const LazyAboutIntroduce = import('../../components/about/introduce.vue' /* webpackChunkName: "components/about-introduce" */).then(c => wrapFunctional(c.default || c))
export const LazyAboutNews = import('../../components/about/news.vue' /* webpackChunkName: "components/about-news" */).then(c => wrapFunctional(c.default || c)) export const LazyAboutNews = import('../../components/about/news.vue' /* webpackChunkName: "components/about-news" */).then(c => wrapFunctional(c.default || c))
export const LazyAboutTabNav = import('../../components/about/tabNav.vue' /* webpackChunkName: "components/about-tab-nav" */).then(c => wrapFunctional(c.default || c)) export const LazyAboutTabNav = import('../../components/about/tabNav.vue' /* webpackChunkName: "components/about-tab-nav" */).then(c => wrapFunctional(c.default || c))
export const LazyAlumnusParty = import('../../components/alumnus/party.vue' /* webpackChunkName: "components/alumnus-party" */).then(c => wrapFunctional(c.default || c))
export const LazyAlumnusTabNav = import('../../components/alumnus/tabNav.vue' /* webpackChunkName: "components/alumnus-tab-nav" */).then(c => wrapFunctional(c.default || c))
export const LazyHomeAlumniStories = import('../../components/home/alumniStories.vue' /* webpackChunkName: "components/home-alumni-stories" */).then(c => wrapFunctional(c.default || c)) export const LazyHomeAlumniStories = import('../../components/home/alumniStories.vue' /* webpackChunkName: "components/home-alumni-stories" */).then(c => wrapFunctional(c.default || c))
export const LazyHomeBanner = import('../../components/home/banner.vue' /* webpackChunkName: "components/home-banner" */).then(c => wrapFunctional(c.default || c)) export const LazyHomeBanner = import('../../components/home/banner.vue' /* webpackChunkName: "components/home-banner" */).then(c => wrapFunctional(c.default || c))
export const LazyHomeDegreeEducation = import('../../components/home/degreeEducation.vue' /* webpackChunkName: "components/home-degree-education" */).then(c => wrapFunctional(c.default || c)) export const LazyHomeDegreeEducation = import('../../components/home/degreeEducation.vue' /* webpackChunkName: "components/home-degree-education" */).then(c => wrapFunctional(c.default || c))
...@@ -39,3 +37,5 @@ export const LazyHomeHeadmasterMsg = import('../../components/home/headmasterMsg ...@@ -39,3 +37,5 @@ export const LazyHomeHeadmasterMsg = import('../../components/home/headmasterMsg
export const LazyHomeOpenClass = import('../../components/home/openClass.vue' /* webpackChunkName: "components/home-open-class" */).then(c => wrapFunctional(c.default || c)) export const LazyHomeOpenClass = import('../../components/home/openClass.vue' /* webpackChunkName: "components/home-open-class" */).then(c => wrapFunctional(c.default || c))
export const LazyHomeProjectNotice = import('../../components/home/projectNotice.vue' /* webpackChunkName: "components/home-project-notice" */).then(c => wrapFunctional(c.default || c)) export const LazyHomeProjectNotice = import('../../components/home/projectNotice.vue' /* webpackChunkName: "components/home-project-notice" */).then(c => wrapFunctional(c.default || c))
export const LazyHomeServiceCase = import('../../components/home/serviceCase.vue' /* webpackChunkName: "components/home-service-case" */).then(c => wrapFunctional(c.default || c)) export const LazyHomeServiceCase = import('../../components/home/serviceCase.vue' /* webpackChunkName: "components/home-service-case" */).then(c => wrapFunctional(c.default || c))
export const LazyAlumnusParty = import('../../components/alumnus/party.vue' /* webpackChunkName: "components/alumnus-party" */).then(c => wrapFunctional(c.default || c))
export const LazyAlumnusTabNav = import('../../components/alumnus/tabNav.vue' /* webpackChunkName: "components/alumnus-tab-nav" */).then(c => wrapFunctional(c.default || c))
...@@ -11,8 +11,6 @@ const components = { ...@@ -11,8 +11,6 @@ const components = {
AboutIntroduce: () => import('../../components/about/introduce.vue' /* webpackChunkName: "components/about-introduce" */).then(c => wrapFunctional(c.default || c)), AboutIntroduce: () => import('../../components/about/introduce.vue' /* webpackChunkName: "components/about-introduce" */).then(c => wrapFunctional(c.default || c)),
AboutNews: () => import('../../components/about/news.vue' /* webpackChunkName: "components/about-news" */).then(c => wrapFunctional(c.default || c)), AboutNews: () => import('../../components/about/news.vue' /* webpackChunkName: "components/about-news" */).then(c => wrapFunctional(c.default || c)),
AboutTabNav: () => import('../../components/about/tabNav.vue' /* webpackChunkName: "components/about-tab-nav" */).then(c => wrapFunctional(c.default || c)), AboutTabNav: () => import('../../components/about/tabNav.vue' /* webpackChunkName: "components/about-tab-nav" */).then(c => wrapFunctional(c.default || c)),
AlumnusParty: () => import('../../components/alumnus/party.vue' /* webpackChunkName: "components/alumnus-party" */).then(c => wrapFunctional(c.default || c)),
AlumnusTabNav: () => import('../../components/alumnus/tabNav.vue' /* webpackChunkName: "components/alumnus-tab-nav" */).then(c => wrapFunctional(c.default || c)),
HomeAlumniStories: () => import('../../components/home/alumniStories.vue' /* webpackChunkName: "components/home-alumni-stories" */).then(c => wrapFunctional(c.default || c)), HomeAlumniStories: () => import('../../components/home/alumniStories.vue' /* webpackChunkName: "components/home-alumni-stories" */).then(c => wrapFunctional(c.default || c)),
HomeBanner: () => import('../../components/home/banner.vue' /* webpackChunkName: "components/home-banner" */).then(c => wrapFunctional(c.default || c)), HomeBanner: () => import('../../components/home/banner.vue' /* webpackChunkName: "components/home-banner" */).then(c => wrapFunctional(c.default || c)),
HomeDegreeEducation: () => import('../../components/home/degreeEducation.vue' /* webpackChunkName: "components/home-degree-education" */).then(c => wrapFunctional(c.default || c)), HomeDegreeEducation: () => import('../../components/home/degreeEducation.vue' /* webpackChunkName: "components/home-degree-education" */).then(c => wrapFunctional(c.default || c)),
...@@ -20,7 +18,9 @@ const components = { ...@@ -20,7 +18,9 @@ const components = {
HomeHeadmasterMsg: () => import('../../components/home/headmasterMsg.vue' /* webpackChunkName: "components/home-headmaster-msg" */).then(c => wrapFunctional(c.default || c)), HomeHeadmasterMsg: () => import('../../components/home/headmasterMsg.vue' /* webpackChunkName: "components/home-headmaster-msg" */).then(c => wrapFunctional(c.default || c)),
HomeOpenClass: () => import('../../components/home/openClass.vue' /* webpackChunkName: "components/home-open-class" */).then(c => wrapFunctional(c.default || c)), HomeOpenClass: () => import('../../components/home/openClass.vue' /* webpackChunkName: "components/home-open-class" */).then(c => wrapFunctional(c.default || c)),
HomeProjectNotice: () => import('../../components/home/projectNotice.vue' /* webpackChunkName: "components/home-project-notice" */).then(c => wrapFunctional(c.default || c)), HomeProjectNotice: () => import('../../components/home/projectNotice.vue' /* webpackChunkName: "components/home-project-notice" */).then(c => wrapFunctional(c.default || c)),
HomeServiceCase: () => import('../../components/home/serviceCase.vue' /* webpackChunkName: "components/home-service-case" */).then(c => wrapFunctional(c.default || c)) HomeServiceCase: () => import('../../components/home/serviceCase.vue' /* webpackChunkName: "components/home-service-case" */).then(c => wrapFunctional(c.default || c)),
AlumnusParty: () => import('../../components/alumnus/party.vue' /* webpackChunkName: "components/alumnus-party" */).then(c => wrapFunctional(c.default || c)),
AlumnusTabNav: () => import('../../components/alumnus/tabNav.vue' /* webpackChunkName: "components/alumnus-tab-nav" */).then(c => wrapFunctional(c.default || c))
} }
for (const name in components) { for (const name in components) {
......
...@@ -15,8 +15,6 @@ You can directly use them in pages and other components without the need to impo ...@@ -15,8 +15,6 @@ You can directly use them in pages and other components without the need to impo
- `<AboutIntroduce>` | `<about-introduce>` (components/about/introduce.vue) - `<AboutIntroduce>` | `<about-introduce>` (components/about/introduce.vue)
- `<AboutNews>` | `<about-news>` (components/about/news.vue) - `<AboutNews>` | `<about-news>` (components/about/news.vue)
- `<AboutTabNav>` | `<about-tab-nav>` (components/about/tabNav.vue) - `<AboutTabNav>` | `<about-tab-nav>` (components/about/tabNav.vue)
- `<AlumnusParty>` | `<alumnus-party>` (components/alumnus/party.vue)
- `<AlumnusTabNav>` | `<alumnus-tab-nav>` (components/alumnus/tabNav.vue)
- `<HomeAlumniStories>` | `<home-alumni-stories>` (components/home/alumniStories.vue) - `<HomeAlumniStories>` | `<home-alumni-stories>` (components/home/alumniStories.vue)
- `<HomeBanner>` | `<home-banner>` (components/home/banner.vue) - `<HomeBanner>` | `<home-banner>` (components/home/banner.vue)
- `<HomeDegreeEducation>` | `<home-degree-education>` (components/home/degreeEducation.vue) - `<HomeDegreeEducation>` | `<home-degree-education>` (components/home/degreeEducation.vue)
...@@ -25,3 +23,5 @@ You can directly use them in pages and other components without the need to impo ...@@ -25,3 +23,5 @@ You can directly use them in pages and other components without the need to impo
- `<HomeOpenClass>` | `<home-open-class>` (components/home/openClass.vue) - `<HomeOpenClass>` | `<home-open-class>` (components/home/openClass.vue)
- `<HomeProjectNotice>` | `<home-project-notice>` (components/home/projectNotice.vue) - `<HomeProjectNotice>` | `<home-project-notice>` (components/home/projectNotice.vue)
- `<HomeServiceCase>` | `<home-service-case>` (components/home/serviceCase.vue) - `<HomeServiceCase>` | `<home-service-case>` (components/home/serviceCase.vue)
- `<AlumnusParty>` | `<alumnus-party>` (components/alumnus/party.vue)
- `<AlumnusTabNav>` | `<alumnus-tab-nav>` (components/alumnus/tabNav.vue)
...@@ -12,8 +12,8 @@ import { setContext, getLocation, getRouteData, normalizeError } from './utils' ...@@ -12,8 +12,8 @@ import { setContext, getLocation, getRouteData, normalizeError } from './utils'
/* Plugins */ /* Plugins */
import nuxt_plugin_plugin_430d6d16 from 'nuxt_plugin_plugin_430d6d16' // Source: ./components/plugin.js (mode: 'all') import nuxt_plugin_plugin_f1f94936 from 'nuxt_plugin_plugin_f1f94936' // Source: ./components/plugin.js (mode: 'all')
import nuxt_plugin_axios_65ca092c from 'nuxt_plugin_axios_65ca092c' // Source: ./axios.js (mode: 'all') import nuxt_plugin_axios_54efb5fb from 'nuxt_plugin_axios_54efb5fb' // Source: ./axios.js (mode: 'all')
import nuxt_plugin_elementui_d905880e from 'nuxt_plugin_elementui_d905880e' // Source: ../plugins/element-ui (mode: 'all') import nuxt_plugin_elementui_d905880e from 'nuxt_plugin_elementui_d905880e' // Source: ../plugins/element-ui (mode: 'all')
import nuxt_plugin_vueswiper_9e702eda from 'nuxt_plugin_vueswiper_9e702eda' // Source: ../plugins/vue-swiper.js (mode: 'client') import nuxt_plugin_vueswiper_9e702eda from 'nuxt_plugin_vueswiper_9e702eda' // Source: ../plugins/vue-swiper.js (mode: 'client')
...@@ -179,12 +179,12 @@ async function createApp(ssrContext, config = {}) { ...@@ -179,12 +179,12 @@ async function createApp(ssrContext, config = {}) {
} }
// Plugin execution // Plugin execution
if (typeof nuxt_plugin_plugin_430d6d16 === 'function') { if (typeof nuxt_plugin_plugin_f1f94936 === 'function') {
await nuxt_plugin_plugin_430d6d16(app.context, inject) await nuxt_plugin_plugin_f1f94936(app.context, inject)
} }
if (typeof nuxt_plugin_axios_65ca092c === 'function') { if (typeof nuxt_plugin_axios_54efb5fb === 'function') {
await nuxt_plugin_axios_65ca092c(app.context, inject) await nuxt_plugin_axios_54efb5fb(app.context, inject)
} }
if (typeof nuxt_plugin_elementui_d905880e === 'function') { if (typeof nuxt_plugin_elementui_d905880e === 'function') {
......
...@@ -26,27 +26,27 @@ export const routerOptions = { ...@@ -26,27 +26,27 @@ export const routerOptions = {
routes: [{ routes: [{
path: "/alumnus", path: "/alumnus",
component: _2dc5f64c, component: _57a4425d,
name: "alumnus" name: "alumnus"
}, { }, {
path: "/about/contact", path: "/about/contact",
component: _44b59cfe, component: _6e93e90f,
name: "about-contact" name: "about-contact"
}, { }, {
path: "/about/culture", path: "/about/culture",
component: _10a7578c, component: _3a85a39d,
name: "about-culture" name: "about-culture"
}, { }, {
path: "/about/introduce", path: "/about/introduce",
component: _23d2f0fd, component: _4f4e7cce,
name: "about-introduce" name: "about-introduce"
}, { }, {
path: "/about/news", path: "/about/news",
component: _7f16db65, component: _347570f4,
name: "about-news" name: "about-news"
}, { }, {
path: "/about/news-detail", path: "/about/news-detail",
component: _249d262e, component: _2879487a,
name: "about-news-detail" name: "about-news-detail"
}, { }, {
path: "/services/major", path: "/services/major",
...@@ -54,7 +54,7 @@ export const routerOptions = { ...@@ -54,7 +54,7 @@ export const routerOptions = {
name: "services-major" name: "services-major"
}, { }, {
path: "/", path: "/",
component: _4d95ac32, component: _43259943,
name: "index" name: "index"
}], }],
......
...@@ -2,44 +2,44 @@ ...@@ -2,44 +2,44 @@
{ {
"name": "alumnus", "name": "alumnus",
"path": "/alumnus", "path": "/alumnus",
"component": "/Users/lihui/Desktop/H/ezijing/guangwangAndXiangmuzhan/ezijing-www-pc/pages/alumnus/index.vue", "component": "/Users/max/gitlab/ezijing-www-pc/pages/alumnus/index.vue",
"chunkName": "pages/alumnus/index", "chunkName": "pages/alumnus/index",
"_name": "_2dc5f64c" "_name": "_57a4425d"
}, },
{ {
"name": "about-contact", "name": "about-contact",
"path": "/about/contact", "path": "/about/contact",
"component": "/Users/lihui/Desktop/H/ezijing/guangwangAndXiangmuzhan/ezijing-www-pc/pages/about/contact.vue", "component": "/Users/max/gitlab/ezijing-www-pc/pages/about/contact.vue",
"chunkName": "pages/about/contact", "chunkName": "pages/about/contact",
"_name": "_44b59cfe" "_name": "_6e93e90f"
}, },
{ {
"name": "about-culture", "name": "about-culture",
"path": "/about/culture", "path": "/about/culture",
"component": "/Users/lihui/Desktop/H/ezijing/guangwangAndXiangmuzhan/ezijing-www-pc/pages/about/culture.vue", "component": "/Users/max/gitlab/ezijing-www-pc/pages/about/culture.vue",
"chunkName": "pages/about/culture", "chunkName": "pages/about/culture",
"_name": "_10a7578c" "_name": "_3a85a39d"
}, },
{ {
"name": "about-introduce", "name": "about-introduce",
"path": "/about/introduce", "path": "/about/introduce",
"component": "/Users/lihui/Desktop/H/ezijing/guangwangAndXiangmuzhan/ezijing-www-pc/pages/about/introduce.vue", "component": "/Users/max/gitlab/ezijing-www-pc/pages/about/introduce.vue",
"chunkName": "pages/about/introduce", "chunkName": "pages/about/introduce",
"_name": "_23d2f0fd" "_name": "_4f4e7cce"
}, },
{ {
"name": "about-news", "name": "about-news",
"path": "/about/news", "path": "/about/news",
"component": "/Users/lihui/Desktop/H/ezijing/guangwangAndXiangmuzhan/ezijing-www-pc/pages/about/news.vue", "component": "/Users/max/gitlab/ezijing-www-pc/pages/about/news.vue",
"chunkName": "pages/about/news", "chunkName": "pages/about/news",
"_name": "_7f16db65" "_name": "_347570f4"
}, },
{ {
"name": "about-news-detail", "name": "about-news-detail",
"path": "/about/news-detail", "path": "/about/news-detail",
"component": "/Users/lihui/Desktop/H/ezijing/guangwangAndXiangmuzhan/ezijing-www-pc/pages/about/news-detail.vue", "component": "/Users/max/gitlab/ezijing-www-pc/pages/about/news-detail.vue",
"chunkName": "pages/about/news-detail", "chunkName": "pages/about/news-detail",
"_name": "_249d262e" "_name": "_2879487a"
}, },
{ {
"name": "services-major", "name": "services-major",
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
{ {
"name": "index", "name": "index",
"path": "/", "path": "/",
"component": "/Users/lihui/Desktop/H/ezijing/guangwangAndXiangmuzhan/ezijing-www-pc/pages/index.vue", "component": "/Users/max/gitlab/ezijing-www-pc/pages/index.vue",
"chunkName": "pages/index", "chunkName": "pages/index",
"_name": "_4d95ac32" "_name": "_43259943"
} }
] ]
...@@ -26,12 +26,6 @@ ...@@ -26,12 +26,6 @@
"AboutTabNav": { "AboutTabNav": {
"description": "Auto imported from components/about/tabNav.vue" "description": "Auto imported from components/about/tabNav.vue"
}, },
"AlumnusParty": {
"description": "Auto imported from components/alumnus/party.vue"
},
"AlumnusTabNav": {
"description": "Auto imported from components/alumnus/tabNav.vue"
},
"HomeAlumniStories": { "HomeAlumniStories": {
"description": "Auto imported from components/home/alumniStories.vue" "description": "Auto imported from components/home/alumniStories.vue"
}, },
...@@ -55,5 +49,11 @@ ...@@ -55,5 +49,11 @@
}, },
"HomeServiceCase": { "HomeServiceCase": {
"description": "Auto imported from components/home/serviceCase.vue" "description": "Auto imported from components/home/serviceCase.vue"
},
"AlumnusParty": {
"description": "Auto imported from components/alumnus/party.vue"
},
"AlumnusTabNav": {
"description": "Auto imported from components/alumnus/tabNav.vue"
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论