提交 256c9f86 authored 作者: 王鹏飞's avatar 王鹏飞

bug fixes

上级 b4343e5a
...@@ -24,9 +24,11 @@ ...@@ -24,9 +24,11 @@
@mouseenter="levelShow(level2Item)" @mouseenter="levelShow(level2Item)"
@mouseleave="levelShow(level2Item, 'out')" @mouseleave="levelShow(level2Item, 'out')"
> >
<app-link :item="{ <app-link
:item="{
path: level2Item.path path: level2Item.path
}"> }"
>
<div class="name"> <div class="name">
{{ level2Item.name }} {{ level2Item.name }}
</div> </div>
...@@ -51,14 +53,14 @@ export default { ...@@ -51,14 +53,14 @@ export default {
navData: [ navData: [
{ {
name: '关于紫荆', name: '关于紫荆',
path: '/about-ezijing/introduce', path: '/about/introduce',
childern: [ childern: [
{ name: '紫荆简介', path: '/about-ezijing/introduce' }, { name: '紫荆简介', path: '/about/introduce' },
{ name: '文化理念', path: '/about-ezijing/culture' }, { name: '文化理念', path: '/about/culture' },
{ name: '新闻中心', path: '/about-ezijing/news' }, { name: '新闻中心', path: '/about/news' },
{ name: '校长寄语', path: '/about-ezijing/message' }, { name: '校长寄语', path: '/about/message' },
{ name: '公开课', path: '/about-ezijing/lesson' }, { name: '公开课', path: '/about/lesson' },
{ name: '联系我们', path: '/about-ezijing/contact' } { name: '联系我们', path: '/about/contact' }
] ]
}, },
{ {
...@@ -110,7 +112,7 @@ export default { ...@@ -110,7 +112,7 @@ export default {
{ name: '热点新闻', path: '/news/hot' }, { name: '热点新闻', path: '/news/hot' },
{ name: '教授采访', path: '/news/interview' } { name: '教授采访', path: '/news/interview' }
] ]
}, }
// { // {
// name: '招生信息', // name: '招生信息',
// path: '/apply/relevant', // path: '/apply/relevant',
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<ul class="list-content"> <ul class="list-content">
<template v-for="(item, index) in listData"> <template v-for="(item, index) in listData">
<li :key="index"> <li :key="index">
<app-link :item="{ news: { data: item, path: '/about-ezijing/news' } }"> <app-link :item="{ news: { data: item, path: '/about/news' } }">
<img :src="item.web_img_uri" alt="" /> <img :src="item.web_img_uri" alt="" />
<div class="right-con"> <div class="right-con">
<div class="time">{{ formatDate(item.start_time) }}</div> <div class="time">{{ formatDate(item.start_time) }}</div>
......
...@@ -2,9 +2,11 @@ ...@@ -2,9 +2,11 @@
<ul class="tab-content"> <ul class="tab-content">
<li <li
v-for="(item, index) in dataNav" v-for="(item, index) in dataNav"
:class="item.pathActive.findIndex(path => { :class="
item.pathActive.findIndex(path => {
return $route.path.includes(path) return $route.path.includes(path)
}) !== -1 && 'active'" }) !== -1 && 'active'
"
:key="index" :key="index"
@click="goPage(item.goPath)" @click="goPage(item.goPath)"
> >
...@@ -19,33 +21,33 @@ export default { ...@@ -19,33 +21,33 @@ export default {
dataNav: [ dataNav: [
{ {
name: '紫荆简介', name: '紫荆简介',
goPath: '/about-ezijing/introduce', goPath: '/about/introduce',
pathActive: ['/about-ezijing/introduce'] pathActive: ['/about/introduce']
}, },
{ {
name: '文化理念', name: '文化理念',
goPath: '/about-ezijing/culture', goPath: '/about/culture',
pathActive: ['/about-ezijing/culture'] pathActive: ['/about/culture']
}, },
{ {
name: '新闻中心', name: '新闻中心',
goPath: '/about-ezijing/news', goPath: '/about/news',
pathActive: ['/about-ezijing/news', '/about-ezijing/news-detail'] pathActive: ['/about/news', '/about/news-detail']
}, },
{ {
name: '校长寄语', name: '校长寄语',
goPath: '/about-ezijing/message', goPath: '/about/message',
pathActive: ['/about-ezijing/message', '/about-ezijing/message-detail'] pathActive: ['/about/message', '/about/message-detail']
}, },
{ {
name: '公开课', name: '公开课',
goPath: '/about-ezijing/lesson', goPath: '/about/lesson',
pathActive: ['/about-ezijing/lesson', '/about-ezijing/lesson-detail'] pathActive: ['/about/lesson', '/about/lesson-detail']
}, },
{ {
name: '联系我们', name: '联系我们',
goPath: '/about-ezijing/contact', goPath: '/about/contact',
pathActive: ['/about-ezijing/contact'] pathActive: ['/about/contact']
} }
// { // {
// name: '招聘信息', // name: '招聘信息',
...@@ -55,8 +57,7 @@ export default { ...@@ -55,8 +57,7 @@ export default {
] ]
} }
}, },
mounted() { mounted() {},
},
methods: { methods: {
goPage(path) { goPage(path) {
this.$router.push({ this.$router.push({
...@@ -67,14 +68,14 @@ export default { ...@@ -67,14 +68,14 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.tab-content{ .tab-content {
width: 160px; width: 160px;
// height: 420px; // height: 420px;
height: fit-content; height: fit-content;
background: #fff; background: #fff;
padding-top: 35px; padding-top: 35px;
padding-bottom: 43px; padding-bottom: 43px;
li{ li {
position: relative; position: relative;
width: 100%; width: 100%;
font-size: 22px; font-size: 22px;
...@@ -83,12 +84,12 @@ export default { ...@@ -83,12 +84,12 @@ export default {
color: #777777; color: #777777;
margin-bottom: 60px; margin-bottom: 60px;
cursor: pointer; cursor: pointer;
&:last-child{ &:last-child {
margin: 0; margin: 0;
} }
&.active{ &.active {
color: rgba(170, 25, 65, 1); color: rgba(170, 25, 65, 1);
&::after{ &::after {
content: ''; content: '';
width: 8px; width: 8px;
height: 40px; height: 40px;
......
...@@ -5,10 +5,7 @@ ...@@ -5,10 +5,7 @@
<div class="line"></div> <div class="line"></div>
<div class="text">校长寄语</div> <div class="text">校长寄语</div>
</div> </div>
<div <div class="right-text" @click="$router.push({ path: '/about/message', query: { type: 'img_text_school' } })">
class="right-text"
@click="$router.push({ path: '/about-ezijing/message', query: { type: 'img_text_school' } })"
>
查看更多+ 查看更多+
</div> </div>
</div> </div>
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
</div> </div>
</template> </template>
<script> <script>
import tab from '../../components/about-ezijing/tabNav' import tab from '../../components/about/tabNav'
import contactContent from '../../components/about-ezijing/contact' import contactContent from '../../components/about/contact'
export default { export default {
layout: 'normal', layout: 'normal',
components: { components: {
...@@ -16,7 +16,7 @@ export default { ...@@ -16,7 +16,7 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.news-content{ .news-content {
width: 1200px; width: 1200px;
margin: 0 auto; margin: 0 auto;
padding-top: 63px; padding-top: 63px;
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
</div> </div>
</template> </template>
<script> <script>
import tab from '../../components/about-ezijing/tabNav' import tab from '../../components/about/tabNav'
import cultureContent from '../../components/about-ezijing/culture' import cultureContent from '../../components/about/culture'
export default { export default {
layout: 'normal', layout: 'normal',
components: { components: {
...@@ -16,7 +16,7 @@ export default { ...@@ -16,7 +16,7 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.culture-content{ .culture-content {
width: 1200px; width: 1200px;
margin: 0 auto; margin: 0 auto;
padding-top: 63px; padding-top: 63px;
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
</div> </div>
</template> </template>
<script> <script>
import tab from '../../components/about-ezijing/tabNav' import tab from '../../components/about/tabNav'
import intrContent from '../../components/about-ezijing/introduce' import intrContent from '../../components/about/introduce'
export default { export default {
layout: 'normal', layout: 'normal',
components: { components: {
...@@ -16,7 +16,7 @@ export default { ...@@ -16,7 +16,7 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.intr-content{ .intr-content {
width: 1200px; width: 1200px;
margin: 0 auto; margin: 0 auto;
padding-top: 63px; padding-top: 63px;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</div> </div>
</template> </template>
<script> <script>
import tab from '@/components/about-ezijing/tabNav' import tab from '@/components/about/tabNav'
export default { export default {
layout: 'normal', layout: 'normal',
components: { components: {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<ul class="list-content"> <ul class="list-content">
<template v-for="(item, index) in listData"> <template v-for="(item, index) in listData">
<li :key="index"> <li :key="index">
<app-link :item="{ news: { data: item, path: '/about-ezijing/lesson' } }"> <app-link :item="{ news: { data: item, path: '/about/lesson' } }">
<img :src="item.web_img_uri" alt="" /> <img :src="item.web_img_uri" alt="" />
<div class="right-con"> <div class="right-con">
<div class="time">{{ formatDate(item.start_time) }}</div> <div class="time">{{ formatDate(item.start_time) }}</div>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</template> </template>
<script> <script>
import appLink from '@/components/Link' import appLink from '@/components/Link'
import tab from '@/components/about-ezijing/tabNav' import tab from '@/components/about/tabNav'
export default { export default {
layout: 'normal', layout: 'normal',
components: { tab, appLink }, components: { tab, appLink },
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</div> </div>
</template> </template>
<script> <script>
import tab from '@/components/about-ezijing/tabNav' import tab from '@/components/about/tabNav'
export default { export default {
layout: 'normal', layout: 'normal',
components: { components: {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<ul class="list-content"> <ul class="list-content">
<template v-for="(item, index) in listData"> <template v-for="(item, index) in listData">
<li :key="index"> <li :key="index">
<app-link :item="{ news: { data: item, path: '/about-ezijing/message' } }"> <app-link :item="{ news: { data: item, path: '/about/message' } }">
<img :src="item.web_img_uri" alt="" /> <img :src="item.web_img_uri" alt="" />
<div class="right-con"> <div class="right-con">
<div class="time">{{ formatDate(item.start_time) }}</div> <div class="time">{{ formatDate(item.start_time) }}</div>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</template> </template>
<script> <script>
import appLink from '@/components/Link' import appLink from '@/components/Link'
import tab from '@/components/about-ezijing/tabNav' import tab from '@/components/about/tabNav'
export default { export default {
layout: 'normal', layout: 'normal',
components: { tab, appLink }, components: { tab, appLink },
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</div> </div>
</template> </template>
<script> <script>
import tab from '@/components/about-ezijing/tabNav' import tab from '@/components/about/tabNav'
export default { export default {
layout: 'normal', layout: 'normal',
components: { components: {
......
<template> <template>
<div class="news-content"> <div class="news-content">
<tab /> <tab />
<new-list :type="type"/> <new-list :type="type" />
</div> </div>
</template> </template>
<script> <script>
import tab from '@/components/about-ezijing/tabNav' import tab from '@/components/about/tabNav'
import newList from '@/components/about-ezijing/newList' import newList from '@/components/about/newList'
export default { export default {
layout: 'normal', layout: 'normal',
components: { tab, newList }, components: { tab, newList },
...@@ -23,12 +23,11 @@ export default { ...@@ -23,12 +23,11 @@ export default {
return this.$route.query.type return this.$route.query.type
} }
}, },
methods: { methods: {}
}
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.pages-box{ .pages-box {
display: flex; display: flex;
padding-bottom: 50px; padding-bottom: 50px;
background: #fff; background: #fff;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论