Merge branch 'feature/expandNew2' into 'release/6.0'

字段修改



See merge request !766

@@ -138,11 +138,11 @@ exports.inviteReg = (req, res, next) => {
 };
 
 // 设置潮流口令
-exports.setTrendWorld = (req, res, next) => {
+exports.setTrendWord = (req, res, next) => {
     let uid = req.user.uid;
     let trendWord = req.query.trendWord;
 
-    req.ctx(expandModel).setTrendWorld(uid, trendWord).then(result => {
+    req.ctx(expandModel).setTrendWord(uid, trendWord).then(result => {
         res.json(result);
     }).catch(next);
 };

@@ -125,7 +125,7 @@ module.exports = class extends global.yoho.BaseModel {
     /**
      * 设置我的潮流口令
      */
-    setTrendWorld(uid, trendWord) {
+    setTrendWord(uid, trendWord) {
         return api.get('', {
             method: 'app.trendword.update',
             uid: uid,

@@ -273,7 +273,7 @@ router.get('/reward-list', expand.rewardList); // 拓展新客 我的奖励列è¡
 router.get('/reward-detail', auth, expand.rewardDetail); // 拓展新客 我的奖励详情页
 router.get('/friend-invite', expand.friendInvite); // 拓展新客 好友邀请页
 router.get('/invite-reg', expand.inviteReg); // 注册成功页
-router.get('/set-trend-world', expand.setTrendWorld); // 设置潮流口令
+router.get('/set-trend-world', expand.setTrendWord); // 设置潮流口令
 router.get('/invite-uesr-info', expand.inviteUserInfo); // 根据邀请码获取个人信息
 
 router.get('/free-mail/index', auth, freeMail.freeMailIndex); // 免邮券主页

@@ -13,7 +13,7 @@
        <div class="title">方法二：使用邀请码</div>
         <div class="code-content">
             <div class="invite-content">
-                <span class="code trend-code">{{#if trendWorld}}{{trendWorld}}{{else}}{{inviteCode}}{{/if}}</span>
+                <span class="code trend-code">{{#if trendWord}}{{trendWord}}{{else}}{{inviteCode}}{{/if}}</span>
                 <span class="modify button">修改</span>
                 {{#if isApp}}
                     <a class="copy button" href='//m.yohobuy.com/?openby:yohobuy={"action":"go.copy","params":{"text":"{{inviteCode}}","message":"复制成功"}}'>复制</a>

@@ -171,8 +171,8 @@ const index = (params) => {
                 headIco: result[0].data.head_ico,
                 vipInfo: result[0].data.vip_info,
                 students: _.get(result[0].data, 'vip_info.is_student', 0) === 1,
-                trendWorld: _.get(result[6].data, 'trendWorld', false),
-                inviteCode: _.get(result[6].data, 'inviteCode', false),
+                trendWord: _.get(result[6].data, 'trendWord', false),
+                inviteCode: _.get(result[6].data, 'inviteCode', ''),
                 trendGuidePopUpDesc: _.get(result[6].data, 'trendGuidePopUpDesc', ''),
                 bannerSrc: _.get(result[7], 'data[0].src', '')
             });
@@ -252,7 +252,7 @@ const myDetails = (uid) => {
                     uname: _.get(result[0], 'data.nickname', ''),
                     vip: _.get(result[0], 'data.vip_info.cur_level')
                 });
-                result[0].data.trendWorld = _.get(result[1].data, 'trendWorld', false);
+                result[0].data.trendWord = _.get(result[1].data, 'trendWord', false);
                 result[0].data.inviteCode = _.get(result[1].data, 'inviteCode', false);
             }
 

@@ -14,14 +14,14 @@
 
                     <div class="invition">
                         <span class="code trend-code">
-                        {{#if trendWorld}}
-                            # {{trendWorld}} #
+                        {{#if trendWord}}
+                            # {{trendWord}} #
                         {{else}}
                             {{inviteCode}}
                         {{/if}}
                         </span>
                         <span class="code-set"></span>
-                        {{#unless trendWorld}}
+                        {{#unless trendWord}}
                         <span class="code-tip"></span>
                         {{/unless}}
                     </div>

@@ -27,16 +27,15 @@
             <span>我的潮流口令</span>
             <span>
                 <a href="//m.yohobuy.com/home/tide-command" class="command">
-                    {{#if trendWorld}}
-                        {{trendWorld}}
+                    {{#if trendWord}}
+                        {{trendWord}}
                     {{else}}
                         {{inviteCode}}
                     {{/if}}
                     <span class="iconfont">&#xe604;</span>
                 </a>
             </span>
-            {{log trendWorld}}
-            {{#unless trendWorld}}
+            {{#unless trendWord}}
             <b class="tip"></b>
             {{/unless}}
         </li>

 <div class="tide-command-page yoho-page">
     {{# invitionDta}}
-    <textarea name="" class="command-textarea" id="command-textarea" placeholder="请设置15位字符以内的潮流口令">{{#if trendWorld}}{{trendWorld}}{{/if}}</textarea>
+    <div class="set-world">
+        <textarea name="" class="command-textarea" id="command-textarea" placeholder="请设置15位字符以内的潮流口令">{{#if trendWord}}{{trendWord}}{{/if}}</textarea>
+    </div>
     
     <span class="world-number">15</span>
 

-<div class="set-trend-world set-trend-hide{{#if trendWorld}} trend-world{{/if}}">
+<div class="set-trend-world set-trend-hide{{#if trendWord}} trend-world{{/if}}">
     <div class="back"></div>
     <div class="set-content">
         <div class="banner">
@@ -6,7 +6,7 @@
         </div>
         <div class="main">
             <div class="title"></div>
-            <textarea type="text" class="trend-world-area trend-code" placeholder="请设置15字以内的潮流口令">{{#if trendWorld}}{{trendWorld}}{{/if}}</textarea>
+            <textarea type="text" class="trend-world-area trend-code" placeholder="请设置15字以内的潮流口令">{{#if trendWord}}{{trendWord}}{{/if}}</textarea>
             <div class="explain">
                 <span class="explain-title">玩转潮流口令，超值福利等你拿</span>
                 <div class="show-explain">

@@ -2,6 +2,11 @@
     width: 100%;
     height: 100%;
     position: relative;
+    background-color: #f0f0f0;
+
+    .set-world {
+        background-color: #fff;
+    }
 
     .command-textarea {
         height: 130px;
@@ -24,7 +29,6 @@
     }
 
     .introduce {
-        background-color: #f0f0f0;
         padding-top: 15px;
     }
 
@@ -34,6 +38,7 @@
         font-size: 24px;
         background-color: #fff;
         padding: 0 54px;
+        margin-bottom: 30px;
 
         .title {
             line-height: 76px;