Merge branch 'hotfix/annual-account' into 'master'
年度账单问题修改 解决分享在分享后的分享内容和分享图片不正确问题,及一些样式调整 See merge request !206
Showing
4 changed files
with
17 additions
and
9 deletions
@@ -103,7 +103,7 @@ const share = (req, res) => { | @@ -103,7 +103,7 @@ const share = (req, res) => { | ||
103 | title: title, | 103 | title: title, |
104 | localCss: true, | 104 | localCss: true, |
105 | data: Object.assign({ | 105 | data: Object.assign({ |
106 | - sUrl: req.originalUrl | 106 | + sUrl: 'http://m.yohobuy.com' + req.originalUrl |
107 | }, q) | 107 | }, q) |
108 | }); | 108 | }); |
109 | }; | 109 | }; |
@@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
3 | <input type="hidden" value="{{sUrl}}" id="s-url"> | 3 | <input type="hidden" value="{{sUrl}}" id="s-url"> |
4 | <div class="account-bg3"> | 4 | <div class="account-bg3"> |
5 | <div class="share-txt"> | 5 | <div class="share-txt"> |
6 | - <span class="name">{{name}}</span><br>的潮流分为<span class="red-color">{{score}}</span><br>击败了<span class="red-color">{{beat}}%</span>的潮人<br>获得 | 6 | + <span class="name">{{name}}</span>的潮流分为<span class="red-color">{{score}}</span><br>击败了<span class="red-color">{{beat}}%</span>的潮人<br>获得 |
7 | </div> | 7 | </div> |
8 | <div class="portrait-{{n}}"></div> | 8 | <div class="portrait-{{n}}"></div> |
9 | <div class="share-txt">称号</div> | 9 | <div class="share-txt">称号</div> |
@@ -79,10 +79,6 @@ $(function() { | @@ -79,10 +79,6 @@ $(function() { | ||
79 | $('.top-downloadbar').css({zIndex: 9}); | 79 | $('.top-downloadbar').css({zIndex: 9}); |
80 | }, 400); | 80 | }, 400); |
81 | 81 | ||
82 | - | ||
83 | - audioAction(); | ||
84 | - listenVideo(); | ||
85 | - | ||
86 | share({ | 82 | share({ |
87 | imgUrl: 'https://feature.yoho.cn/300x300.png', | 83 | imgUrl: 'https://feature.yoho.cn/300x300.png', |
88 | title: 'YOHO!BUY有货年度潮流账单——快来看看你的潮流形象!速戳>>', | 84 | title: 'YOHO!BUY有货年度潮流账单——快来看看你的潮流形象!速戳>>', |
@@ -90,6 +86,10 @@ $(function() { | @@ -90,6 +86,10 @@ $(function() { | ||
90 | desc: 'YOHO!BUY有货2016潮流轨迹' | 86 | desc: 'YOHO!BUY有货2016潮流轨迹' |
91 | }); | 87 | }); |
92 | 88 | ||
89 | + if ($('.account-share-page').length === 0) { | ||
90 | + audioAction(); | ||
91 | + listenVideo(); | ||
92 | + | ||
93 | mySwiper = new Swiper('.swiper-container', { | 93 | mySwiper = new Swiper('.swiper-container', { |
94 | direction: 'vertical', | 94 | direction: 'vertical', |
95 | onTransitionEnd: function(swiper) { | 95 | onTransitionEnd: function(swiper) { |
@@ -189,4 +189,5 @@ $(function() { | @@ -189,4 +189,5 @@ $(function() { | ||
189 | $('.start-btn').on('click', function() { | 189 | $('.start-btn').on('click', function() { |
190 | mySwiper.slideTo(1, 1000, true); | 190 | mySwiper.slideTo(1, 1000, true); |
191 | }); | 191 | }); |
192 | + } | ||
192 | }); | 193 | }); |
@@ -591,9 +591,8 @@ | @@ -591,9 +591,8 @@ | ||
591 | } | 591 | } |
592 | 592 | ||
593 | .account-2-consume { | 593 | .account-2-consume { |
594 | - position: absolute; | ||
595 | - left: 70px; | ||
596 | - top: 100px; | 594 | + max-width: 550px; |
595 | + margin: 100px auto 0; | ||
597 | 596 | ||
598 | .chop-hand { | 597 | .chop-hand { |
599 | width: 349px; | 598 | width: 349px; |
@@ -707,12 +706,20 @@ | @@ -707,12 +706,20 @@ | ||
707 | line-height: 60px; | 706 | line-height: 60px; |
708 | font-weight: bold; | 707 | font-weight: bold; |
709 | text-align: center; | 708 | text-align: center; |
709 | + margin: 0 auto; | ||
710 | + max-width: 85%; | ||
710 | } | 711 | } |
711 | 712 | ||
712 | .name { | 713 | .name { |
713 | font-size: 50px; | 714 | font-size: 50px; |
714 | margin-top: 50px; | 715 | margin-top: 50px; |
715 | display: inline-block; | 716 | display: inline-block; |
717 | + max-height: 120px; | ||
718 | + overflow: hidden; | ||
719 | + text-overflow: ellipsis; | ||
720 | + display: -webkit-box; | ||
721 | + -webkit-line-clamp: 2; | ||
722 | + -webkit-box-orient: vertical; | ||
716 | } | 723 | } |
717 | 724 | ||
718 | .create-btn { | 725 | .create-btn { |
-
Please register or login to post a comment