Commit c4947de6 by mamingqun

cb

parent 024ba60a
......@@ -98,7 +98,7 @@ export default {
.music-box {
position: absolute;
top: 5%;
right: 5%;
left: 5%;
z-index: 100000;
.music {
......
......@@ -36,7 +36,7 @@ export default new Router({
component: erjiye
},
{
path: 'xiangqing',
path: 'xiangqing/:id',
name: 'xiangqing',
component: xiangqing
},
......
......@@ -47,7 +47,7 @@
<!-- <yjml/> -->
<!-- <erjiye/> -->
<!-- <xiangqing /> -->
<music/>
<music />
<transition :name="transitionName" mode="in-out">
<keep-alive>
......@@ -102,17 +102,17 @@ export default {
// this.erjiye = !this.erjiye
this.$router.push({ name: 'erjiye' })
},
handleXiangqing() {
handleXiangqing(id) {
// this.xiangqing = !this.xiangqing
this.$router.push({ name: 'xiangqing' })
this.$router.push({ name: 'xiangqing', params: { id: id } })
},
GoOrBack() {
this.$navigation.on('forward', (to, from) => {
// console.log('前进')
console.log('前进')
this.transitionName = 'fanye1'
})
this.$navigation.on('back', (to, from) => {
// console.log('后退');
console.log('后退');
this.transitionName = 'fanye2'
})
},
......@@ -121,7 +121,7 @@ export default {
console.log(page);
switch (page) {
switch (page.pageName) {
case 'shouye':
this.handleShouye()
break;
......@@ -135,7 +135,7 @@ export default {
this.handleErjiye()
break;
case 'xiangqing':
this.handleXiangqing()
this.handleXiangqing(page.id)
break;
default:
break;
......@@ -177,7 +177,7 @@ body {
// vue 动画样式
.fanye1-enter-active {
// animation: fanye1 1s ease-in reverse;
animation: fanye1 0.5s ease-in reverse;
}
.fanye1-leave-active {
animation: fanye1 0.5s ease-in;
......@@ -187,7 +187,7 @@ body {
animation: fanye1 0.5s ease-in reverse;
}
.fanye2-leave-active {
// animation: fanye1 1s ease-in reverse;
animation: fanye1 0.5s ease-in;
}
@keyframes fanye1 {
......
......@@ -82,7 +82,7 @@ export default {
handleDetail(id, title, item) {
if (item.module === 2) {
$eventbus.$emit('jumpPage', 'xiangqing')
$eventbus.$emit('jumpPage', {pageName:'xiangqing',id:id})
setTimeout(() => {
$eventbus.$emit('detailData', { id, title })
});
......@@ -268,7 +268,7 @@ p:nth-child(1) {
li {
height: 98 / @r;
line-height: 98 / @r;
font-size: 40 / @r;
font-size: 35 / @r;
}
.main-title {
......@@ -293,8 +293,6 @@ p:nth-child(1) {
margin-bottom: 20 / @r;
padding-left: 45 / @r;
white-space: nowrap;
// display: none;
// height: 0;
}
}
}
......
......@@ -34,19 +34,11 @@ export default {
}, 1000);
},
mounted() {
// this.$nextTick(() => {
// $('#flipbook').turn({
// width: 300,
// height: 600,
// autoCenter: true,
// acceleration: true,
// duration: 600
// });
// })
},
methods: {
handleJump() {
$eventbus.$emit('jumpPage', 'xu')
$eventbus.$emit('jumpPage', {pageName:'xu'})
}
},
components: {
......@@ -149,7 +141,7 @@ export default {
left: 50%;
bottom: 6%;
white-space: nowrap;
font-size: 12 / @r;
font-size: 30 / @r;
text-align: center;
.top-info{
......
......@@ -7,15 +7,34 @@
<div class="title">万达招采</div>
<div class="content">
<div v-shotclick="handleClick">
<li class="main-title">封面</li>
<li class="main-title"></li>
<ul v-for="(item, index) in $store.state.list" :key="index">
<li class="main-title" @click="goFengMian">封面</li>
<li class="main-title" @click="goXu"></li>
<!-- <ul v-for="(item, index) in $store.state.list" :key="index">
<li class="main-title">{{item.catname}}</li>
<li
v-for="(ele, num) in item.child"
:key="num"
@click="handleDetail(ele.news_id,ele.title)"
>{{ele.title}}</li>
</ul>-->
<ul :id="index + 1" v-for="(item, index) in $store.state.list" :key="index">
<li class="main-title">{{item.catname}}</li>
<div v-for="(ele, num) in item.child" :key="num">
<li
:id="ele.catname"
class="sub-title"
@click="handleDetail(ele.news_id,ele.catname,ele)"
data-category="0"
>{{ele.catname}}</li>
<div :class="[ele.catname,'none']">
<li
class="san-title"
v-for="(park, num1) in ele.child"
:key="num1 + '123'"
@click="handleDetail(park.news_id,park.catname,park)"
>{{park.catname}}</li>
</div>
</div>
</ul>
</div>
</div>
......@@ -51,10 +70,13 @@ export default {
this.htmlData = null
this.mianTitle = null
this.mulu = false
this.getDetail(this.$route.params.id)
},
mounted() {
this.watchDetail()
this.getDetail(this.$route.params.id)
var clipboard = new Clipboard('.btn');
clipboard.on('success', function (e) {
......@@ -70,14 +92,13 @@ export default {
this.mulu = !this.mulu
},
handleClick() {
console.log(123);
},
handleJump() {
console.log(123123)
},
watchDetail() {
$eventbus.$on('detailData', (params) => {
this.getDetail(params.id)
this.mianTitle = params.title
})
},
......@@ -91,9 +112,36 @@ export default {
handleDetail(id, title) {
console.log('id,title详情1目录的点击')
console.log(id, title)
if (item.module === 2) {
$eventbus.$emit('jumpPage', { pageName: 'xiangqing', id: id })
setTimeout(() => {
$eventbus.$emit('detailData', { id, title })
});
} else {
var num = $('#' + item.catname).data('category')
if (num === 0) {
$('.' + item.catname).animate({
display: 'block',
height: 'toggle'
});
$('#' + item.catname).data('category', 1)
} else {
$('.' + item.catname).animate({
display: 'none',
height: 'toggle'
});
$('#' + item.catname).data('category', 0)
}
}
},
closeMulu() {
this.mulu = false;
},
goFengMian() {
$eventbus.$emit('jumpPage', { pageName: 'shouye' })
},
goXu() {
$eventbus.$emit('jumpPage', { pageName: 'xu' })
}
}
}
......@@ -109,6 +157,7 @@ export default {
right: 0;
bottom: 0;
z-index: 502;
background: rgba(0, 0, 0, 0.7);
.mulu {
width: 600 / @r;
......
......@@ -61,7 +61,7 @@ export default {
},
methods: {
handleJump() {
$eventbus.$emit('jumpPage', 'yjml')
$eventbus.$emit('jumpPage', { pageName: 'yjml'} )
}
}
}
......
......@@ -64,7 +64,7 @@ export default {
},
handleJump() {
$eventbus.$emit('jumpPage', 'erjiye')
$eventbus.$emit('jumpPage', {pageName:'erjiye'})
setTimeout(() => {
$eventbus.$emit('maodian', this.tancengIndex)
});
......@@ -132,7 +132,7 @@ export default {
left: 50%;
bottom: -40 / @r;
white-space: nowrap;
font-size: 12 / @r;
font-size: 30 / @r;
margin-left: -130 / @r;
span {
......@@ -146,7 +146,7 @@ export default {
left: 50%;
top: 42%;
width: 506 / @r;
height: 390 / @r;
height: 410 / @r;
margin-left: -253 / @r;
overflow: auto;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment