Authored by 陈峰

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

年度账单问题修改

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

See merge request !206
... ... @@ -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,6 +86,10 @@ $(function() {
desc: 'YOHO!BUY有货2016潮流轨迹'
});
if ($('.account-share-page').length === 0) {
audioAction();
listenVideo();
mySwiper = new Swiper('.swiper-container', {
direction: 'vertical',
onTransitionEnd: function(swiper) {
... ... @@ -189,4 +189,5 @@ $(function() {
$('.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 {
... ...