Commit 5e16efac by mamingqun

cb

parent c661902b
...@@ -69,7 +69,8 @@ export default { ...@@ -69,7 +69,8 @@ export default {
keyWord: '', keyWord: '',
searchList: [], searchList: [],
filterList: [], filterList: [],
upAndDown: 'up-img' upAndDown: 'up-img',
lastOpen: null
} }
}, },
activated() { activated() {
...@@ -107,7 +108,9 @@ export default { ...@@ -107,7 +108,9 @@ export default {
$eventbus.$emit('detailData', { id, title }) $eventbus.$emit('detailData', { id, title })
}); });
} else { } else {
var num = $('#' + item.catname).data('category') var num = $('#' + item.catname).data('category')
if (num === 0) { if (num === 0) {
$('.' + item.catname).animate({ $('.' + item.catname).animate({
display: 'block', display: 'block',
...@@ -124,6 +127,8 @@ export default { ...@@ -124,6 +127,8 @@ export default {
$('#' + item.catname).data('category', 0) $('#' + item.catname).data('category', 0)
$('#' + item.catname + ' .xiala').removeClass('up') $('#' + item.catname + ' .xiala').removeClass('up')
} }
this.lastOpen = item.catname
} }
}, },
resetSearch() { resetSearch() {
...@@ -169,19 +174,10 @@ export default { ...@@ -169,19 +174,10 @@ export default {
nScrollHight = $(this)[0].scrollHeight; nScrollHight = $(this)[0].scrollHeight;
nScrollTop = $(this)[0].scrollTop; nScrollTop = $(this)[0].scrollTop;
console.log(nScrollTop); _this.$store.commit('chageEjiyeScroll', nScrollTop)
_this.$store.commit('chageEjiyeScroll',nScrollTop)
// if (nScrollTop === 0) {
// _this.upAndDown = 'up-img'
// }
// if (nScrollTop + nDivHight >= nScrollHight) {
// // alert("以到底")
// _this.upAndDown = 'down-img'
// }
}); });
} },
}, },
watch: { watch: {
keyWord(newVal, oldVal) { keyWord(newVal, oldVal) {
...@@ -198,6 +194,16 @@ export default { ...@@ -198,6 +194,16 @@ export default {
this.filterList = arr this.filterList = arr
} }
},
lastOpen(newVal, oldVal) {
if (newVal !== oldVal &&newVal&&oldVal) {
$('.' + oldVal).animate({
display: 'none',
height: 'toggle'
});
$('#' + oldVal).data('category', 0)
$('#' + oldVal + ' .xiala').removeClass('up')
}
} }
}, },
components: { components: {
...@@ -399,7 +405,7 @@ export default { ...@@ -399,7 +405,7 @@ export default {
padding-left: 45 / @r; padding-left: 45 / @r;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow : ellipsis; text-overflow: ellipsis;
} }
} }
} }
......
...@@ -5,11 +5,6 @@ ...@@ -5,11 +5,6 @@
<div id="io" class="xu" @click="handleJump"> <div id="io" class="xu" @click="handleJump">
<div class="main-box"> <div class="main-box">
<div class="title"></div> <div class="title"></div>
<!-- <div class="content">
<ul class="content-box">
<div class="text-box"></div>
</ul>
</div>-->
<div class="content1"> <div class="content1">
<div class="bi"></div> <div class="bi"></div>
<div class="content2"></div> <div class="content2"></div>
...@@ -43,7 +38,7 @@ export default { ...@@ -43,7 +38,7 @@ export default {
}, },
judgeHuaDong() { judgeHuaDong() {
var _this = this; var _this = this;
$(function () { $(function () {
function judge() { function judge() {
var startx;//让startx在touch事件函数里是全局性变量。 var startx;//让startx在touch事件函数里是全局性变量。
...@@ -97,14 +92,17 @@ export default { ...@@ -97,14 +92,17 @@ export default {
} }
.to-left { .to-left {
width: 90 / @r; width: 150 / @r;
height: 90 / @r; height: 150 / @r;
position: absolute; position: absolute;
right: 15 / @r; right: 15 / @r;
top: 50%; left: 50%;
bottom: 3%;
background: url("../assets/images/02/left.png") no-repeat; background: url("../assets/images/02/left.png") no-repeat;
background-size: contain; background-size: contain;
margin-left: -75 / @r;
animation: left infinite alternate 0.5s linear; animation: left infinite alternate 0.5s linear;
z-index: 10000;
} }
@keyframes left { @keyframes left {
......
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