没有口令显示邀请码

@@ -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>

@@ -41,7 +41,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',

@@ -34,7 +34,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');
         }
     }