Merge branch 'feature/newHome' into 'release/6.1'

Feature/new home



See merge request !904

@@ -70,6 +70,7 @@ class newQrcode extends global.yoho.BaseModel {
             }
             if (_.get(result, '[1]data')) {
                 resu.trendWord = result[1].data.trendWord;
+                resu.inviteCode = result[1].data.inviteCode;
             }
             if (_.get(result, '[2]')) {
                 resu.token = result[2];

@@ -12,7 +12,13 @@
                     <div class="trend-code-c">
                         <div class="dot">#&nbsp;</div>
                         <div class="scroll-c go-scroll">
-                            <div class="scroll-words trend-code">{{trendCode}}</div>
+                            <div class="scroll-words trend-code{{#if trendCode}} trend{{/if}}">
+                                {{#if trendCode}}
+                                {{trendCode}}
+                                {{else}}
+                                {{../inviteCode}}
+                                {{/if}}
+                            </div>
                         </div>
                         <div class="dot">&nbsp;#</div>
                         <div class="iconfont edit code-set">&#xe731;</div>

@@ -10,7 +10,13 @@
                 <div class="passcode">
                     <div class="dot">#&nbsp;</div>
                     <div class="auto-scroll">
-                        <div class="scroll-words go-scroll">{{trendWord}}</div>
+                        <div class="scroll-words go-scroll">
+                            {{#if trendWord}}
+                            {{trendWord}}
+                            {{else}}
+                            {{inviteCode}}
+                            {{/if}}
+                        </div>
                     </div>
                     <div class="dot">&nbsp;#</div>
                 </div>

@@ -15,7 +15,8 @@ class NewHome extends Page {
             $userAvatar: $('.user-avatar'),
             $codeSet: $('.code-set'),
             $resYas: $('.res-c').find('a'),
-            $trendCode: $('.trend-code')
+            $trendCode: $('.trend-code'),
+            $floatTop: $('.float-top')
         };
 
         this.init();
@@ -27,9 +28,20 @@ class NewHome extends Page {
         this.swiper();
         this.showTrend();
         this.autoScroll();
+        this.backToTop();
         window.reMarginFooter('.footer-tab');
     }
 
+    backToTop() {
+        $(document).scroll(() => {
+            if (($(document).scrollTop() >= 120)) {
+                this.selector.$floatTop.addClass('hover');
+            } else {
+                this.selector.$floatTop.removeClass('hover');
+            }
+        });
+    }
+
     autoScroll() {
         new AutoScroll(
             {
@@ -41,7 +53,7 @@ class NewHome extends Page {
 
     // 首次进入个人中心，且登陆，且没有设置潮流口令，打开弹框子
     showTrend() {
-        if (yoho.isLogin() && (!this.selector.$trendCode.html()) && !window.cookie('first-trend')) {
+        if (yoho.isLogin() && (!this.selector.$trendCode.hasClass('trend')) && !window.cookie('first-trend')) {
             $('.set-trend-world').removeClass('set-trend-hide');
             window.setCookie('first-trend', true, {
                 path: '/home',

@@ -65,7 +65,7 @@ class NewQrcode extends Page {
         let containerWidth = this.selector.$autoScroll.width();
         let innerWidth = this.selector.$scrollWords.width();
 
-        if (innerWidth <= containerWidth) {
+        if (innerWidth <= (containerWidth + 1)) {
             this.selector.$scrollWords.removeClass('go-scroll');
         }
     }

@@ -298,17 +298,18 @@
             }
 
             .val {
-                width: 28px;
-                height: 28px;
-                border-radius: 14px;
+                width: 56px;
+                height: 56px;
+                border-radius: 50%;
                 color: #fff;
                 background: #d0021b;
-                line-height: 28px;
+                line-height: 56px;
                 text-align: center;
                 position: absolute;
-                top: 15px;
-                right: 75px;
-                font-size: 18px;
+                top: 5px;
+                right: 60px;
+                font-size: 36px;
+                transform: scale(0.5);
             }
         }
     }

@@ -248,8 +248,8 @@
     }
 
     .ul-arr {
-        width: 26px;
-        height: 26px;
+        width: 30px;
+        height: 30px;
         position: absolute;
         top: 4px;
         right: 32px;