fe / yohobuywap-node · Commits

Go to a project

Authored by 陈峰
Commit 672cedd2fe26e3ff9d79b8921e45d6064407373b 2 parents 29263c9b db943c02

Merge branch 'hotfix/annual-account' into 'master' 

年度账单问题修改

解决分享在分享后的分享内容和分享图片不正确问题，及一些样式调整

See merge request !206
Inline Side-by-side
Showing 4 changed files with 101 additions and 93 deletions
... ... @@ -103,7 +103,7 @@ const share = (req, res) => {
title: title,
localCss: true,
data: Object.assign({
sUrl: req.originalUrl
sUrl: 'http://m.yohobuy.com' + req.originalUrl
}, q)
});
};
... ...
... ... @@ -3,7 +3,7 @@
<input type="hidden" value="{{sUrl}}" id="s-url">
<div class="account-bg3">
<div class="share-txt">
<span class="name">{{name}}</span><br>的潮流分为<span class="red-color">{{score}}</span><br>击败了<span class="red-color">{{beat}}%</span>的潮人<br>获得
<span class="name">{{name}}</span>的潮流分为<span class="red-color">{{score}}</span><br>击败了<span class="red-color">{{beat}}%</span>的潮人<br>获得
</div>
<div class="portrait-{{n}}"></div>
<div class="share-txt">称号</div>
... ...
... ... @@ -79,10 +79,6 @@ $(function() {
$('.top-downloadbar').css({zIndex: 9});
}, 400);
audioAction();
listenVideo();
share({
imgUrl: 'https://feature.yoho.cn/300x300.png',
title: 'YOHO!BUY有货年度潮流账单——快来看看你的潮流形象！速戳>>',
... ... @@ -90,103 +86,108 @@ $(function() {
desc: 'YOHO!BUY有货2016潮流轨迹'
});
mySwiper = new Swiper('.swiper-container', {
direction: 'vertical',
onTransitionEnd: function(swiper) {
var aIndex = swiper.activeIndex;
var i = 1;
if (aIndex === 1) {
setTimeout(function() {
$nav2Img.addClass('n2-img-animation');
$purdah1.addClass('purdah1-animation');
}, 300);
}
if ($('.account-share-page').length === 0) {
audioAction();
listenVideo();
mySwiper = new Swiper('.swiper-container', {
direction: 'vertical',
onTransitionEnd: function(swiper) {
var aIndex = swiper.activeIndex;
var i = 1;
if (aIndex === 1) {
setTimeout(function() {
$nav2Img.addClass('n2-img-animation');
$purdah1.addClass('purdah1-animation');
}, 300);
}
if (aIndex === 2) {
$purdahLeft.addClass('purdah-l-animation');
$purdahRight.addClass('purdah-r-animation');
if ($monthList.find('li').length === 0) {
for (i; i <= 32; i++) {
if (i === 7) {
$monthList.find('ul').append('<li class="goods-' + i + '"><div class="goods-gif-' + i + '"></div></li>');
} else {
$monthList.find('ul').append('<li class="goods-' + i + '"></li>');
if (aIndex === 2) {
$purdahLeft.addClass('purdah-l-animation');
$purdahRight.addClass('purdah-r-animation');
if ($monthList.find('li').length === 0) {
for (i; i <= 32; i++) {
if (i === 7) {
$monthList.find('ul').append('<li class="goods-' + i + '"><div class="goods-gif-' + i + '"></div></li>');
} else {
$monthList.find('ul').append('<li class="goods-' + i + '"></li>');
}
}
}
$monthList.fadeIn();
}
$monthList.fadeIn();
}
if (aIndex === 3) {
$runMen.fadeIn();
}
if (aIndex === 3) {
$runMen.fadeIn();
}
if (aIndex !== 4) {
$video[0].pause();
if (audioStatus) {
$audio[0].play();
if (aIndex !== 4) {
$video[0].pause();
if (audioStatus) {
$audio[0].play();
}
}
}
if (aIndex === 4) {
$videoBox.addClass('video-animation');
setTimeout(function() {
$('#video').show();
}, 600);
}
if (aIndex === 4) {
$videoBox.addClass('video-animation');
setTimeout(function() {
$('#video').show();
}, 600);
}
if (aIndex === 5) {
$spokesman.addClass('spokesman-animation');
tbTime = setTimeout(function() {
$tB.addClass('txt-animation');
}, 500);
handTime = setTimeout(function() {
$hand.addClass('hand-animation');
}, 1000);
twTime = setTimeout(function() {
$tW.addClass('txt-animation');
}, 1500);
}
},
onSlideChangeStart: function(swiper) {
var aIndex = swiper.activeIndex;
if (aIndex === 1 || aIndex === 3) {
$purdahLeft.removeClass('purdah-l-animation');
$purdahRight.removeClass('purdah-r-animation');
$monthList.fadeOut();
$monthList.find('ul').scrollLeft(0);
}
if (aIndex === 5) {
$spokesman.addClass('spokesman-animation');
tbTime = setTimeout(function() {
$tB.addClass('txt-animation');
}, 500);
handTime = setTimeout(function() {
$hand.addClass('hand-animation');
}, 1000);
twTime = setTimeout(function() {
$tW.addClass('txt-animation');
}, 1500);
}
},
onSlideChangeStart: function(swiper) {
var aIndex = swiper.activeIndex;
if (aIndex === 1 || aIndex === 3) {
$purdahLeft.removeClass('purdah-l-animation');
$purdahRight.removeClass('purdah-r-animation');
$monthList.fadeOut();
$monthList.find('ul').scrollLeft(0);
}
if (aIndex === 0 || aIndex === 2) {
$nav2Img.removeClass('n2-img-animation');
$purdah1.removeClass('purdah1-animation');
}
if (aIndex === 0 || aIndex === 2) {
$nav2Img.removeClass('n2-img-animation');
$purdah1.removeClass('purdah1-animation');
}
if (aIndex === 2 || aIndex === 4) {
$runMen.hide();
}
if (aIndex === 2 || aIndex === 4) {
$runMen.hide();
}
if (aIndex === 3 || aIndex === 5) {
$videoBox.removeClass('video-animation');
$('#video').hide();
}
if (aIndex === 3 || aIndex === 5) {
$videoBox.removeClass('video-animation');
$('#video').hide();
}
if (aIndex === 4 || aIndex === 6) {
clearTimeout(tbTime);
clearTimeout(twTime);
clearTimeout(handTime);
$spokesman.removeClass('spokesman-animation');
$tB.removeClass('txt-animation');
$hand.removeClass('hand-animation');
$tW.removeClass('txt-animation');
if (aIndex === 4 || aIndex === 6) {
clearTimeout(tbTime);
clearTimeout(twTime);
clearTimeout(handTime);
$spokesman.removeClass('spokesman-animation');
$tB.removeClass('txt-animation');
$hand.removeClass('hand-animation');
$tW.removeClass('txt-animation');
}
}
}
});
});
// 开启2016潮流轨迹按钮
$('.start-btn').on('click', function() {
mySwiper.slideTo(1, 1000, true);
});
// 开启2016潮流轨迹按钮
$('.start-btn').on('click', function() {
mySwiper.slideTo(1, 1000, true);
});
}
});
... ...
... ... @@ -591,9 +591,8 @@
}
.account-2-consume {
position: absolute;
left: 70px;
top: 100px;
max-width: 550px;
margin: 100px auto 0;
.chop-hand {
width: 349px;
... ... @@ -707,12 +706,20 @@
line-height: 60px;
font-weight: bold;
text-align: center;
margin: 0 auto;
max-width: 85%;
}
.name {
font-size: 50px;
margin-top: 50px;
display: inline-block;
max-height: 120px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.create-btn {
... ...