Merge remote-tracking branch 'origin/feature/newQrcode' into release/6.1

毕凯
Commit 762dae22bc1e1acc6246217e6c2e164bdb63ad0f 2 parents d8a2aaf9 33fff556
Showing 2 changed files with 5 additions and 2 deletions
apps/home/models/newQrcode.js
public/scss/home/new-qrcode.page.css
--- a/apps/home/models/newQrcode.js
View file @762dae2
+++ b/apps/home/models/newQrcode.js
View file @762dae2
@@ -55,8 +55,7 @@ class newQrcode extends global.yoho.BaseModel {
                 resu = result[0].data;
             }
             if (_.get(result, '[1]data')) {
-                resu.trendWord = result[1].data.trendWord;
-                resu.inviteCode = result[1].data.inviteCode;
+                resu.trendWord = result[1].data.trendWord || result[1].data.inviteCode;
             }
             if (_.get(result, '[2]')) {
                 resu.token = result[2];
--- a/public/scss/home/new-qrcode.page.css
View file @762dae2
+++ b/public/scss/home/new-qrcode.page.css
View file @762dae2
@@ -97,6 +97,10 @@ html {
                     width: 30px;
                 }
+                .dot:last-child {
+                    text-align: right;
+                }
+
                 .auto-scroll {
                     max-width: 280px;
                     height: 50px;