fe / yohobuywap-node · Commits

Go to a project

Authored by 张孝茹
Commit c77f84d82aadc637f97577ffa477ebb0384d5650 2 parents 23cea3c7 500dd329

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

字段修改



See merge request !766
Inline Side-by-side
Showing 11 changed files with 25 additions and 19 deletions
@@ -138,11 +138,11 @@ exports.inviteReg = (req, res, next) => { @@ -138,11 +138,11 @@ exports.inviteReg = (req, res, next) => {
138 }; 138 };
139 139
140 // 设置潮流口令 140 // 设置潮流口令
141 -exports.setTrendWorld = (req, res, next) => { 141 +exports.setTrendWord = (req, res, next) => {
142 let uid = req.user.uid; 142 let uid = req.user.uid;
143 let trendWord = req.query.trendWord; 143 let trendWord = req.query.trendWord;
144 144
145 - req.ctx(expandModel).setTrendWorld(uid, trendWord).then(result => { 145 + req.ctx(expandModel).setTrendWord(uid, trendWord).then(result => {
146 res.json(result); 146 res.json(result);
147 }).catch(next); 147 }).catch(next);
148 }; 148 };
@@ -125,7 +125,7 @@ module.exports = class extends global.yoho.BaseModel { @@ -125,7 +125,7 @@ module.exports = class extends global.yoho.BaseModel {
125 /** 125 /**
126 * 设置我的潮流口令 126 * 设置我的潮流口令
127 */ 127 */
128 - setTrendWorld(uid, trendWord) { 128 + setTrendWord(uid, trendWord) {
129 return api.get('', { 129 return api.get('', {
130 method: 'app.trendword.update', 130 method: 'app.trendword.update',
131 uid: uid, 131 uid: uid,
@@ -273,7 +273,7 @@ router.get('/reward-list', expand.rewardList); // 拓展新客 æˆ‘çš„å¥–åŠ±åˆ—è¡ @@ -273,7 +273,7 @@ router.get('/reward-list', expand.rewardList); // 拓展新客 我的奖励列è¡
273 router.get('/reward-detail', auth, expand.rewardDetail); // 拓展新客 我的奖励详情页 273 router.get('/reward-detail', auth, expand.rewardDetail); // 拓展新客 我的奖励详情页
274 router.get('/friend-invite', expand.friendInvite); // 拓展新客 好友邀请页 274 router.get('/friend-invite', expand.friendInvite); // 拓展新客 好友邀请页
275 router.get('/invite-reg', expand.inviteReg); // 注册成功页 275 router.get('/invite-reg', expand.inviteReg); // 注册成功页
276 -router.get('/set-trend-world', expand.setTrendWorld); // 设置潮流口令 276 +router.get('/set-trend-world', expand.setTrendWord); // 设置潮流口令
277 router.get('/invite-uesr-info', expand.inviteUserInfo); // 根据邀请码获取个人信息 277 router.get('/invite-uesr-info', expand.inviteUserInfo); // 根据邀请码获取个人信息
278 278
279 router.get('/free-mail/index', auth, freeMail.freeMailIndex); // 免邮券主页 279 router.get('/free-mail/index', auth, freeMail.freeMailIndex); // 免邮券主页
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <div class="title">方法二：使用邀请码</div> 13 <div class="title">方法二：使用邀请码</div>
14 <div class="code-content"> 14 <div class="code-content">
15 <div class="invite-content"> 15 <div class="invite-content">
16 - <span class="code trend-code">{{#if trendWorld}}{{trendWorld}}{{else}}{{inviteCode}}{{/if}}</span> 16 + <span class="code trend-code">{{#if trendWord}}{{trendWord}}{{else}}{{inviteCode}}{{/if}}</span>
17 <span class="modify button">修改</span> 17 <span class="modify button">修改</span>
18 {{#if isApp}} 18 {{#if isApp}}
19 <a class="copy button" href='//m.yohobuy.com/?openby:yohobuy={"action":"go.copy","params":{"text":"{{inviteCode}}","message":"复制成功"}}'>复制</a> 19 <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) => { @@ -171,8 +171,8 @@ const index = (params) => {
171 headIco: result[0].data.head_ico, 171 headIco: result[0].data.head_ico,
172 vipInfo: result[0].data.vip_info, 172 vipInfo: result[0].data.vip_info,
173 students: _.get(result[0].data, 'vip_info.is_student', 0) === 1, 173 students: _.get(result[0].data, 'vip_info.is_student', 0) === 1,
174 - trendWorld: _.get(result[6].data, 'trendWorld', false),  
175 - inviteCode: _.get(result[6].data, 'inviteCode', false), 174 + trendWord: _.get(result[6].data, 'trendWord', false),
  175 + inviteCode: _.get(result[6].data, 'inviteCode', ''),
176 trendGuidePopUpDesc: _.get(result[6].data, 'trendGuidePopUpDesc', ''), 176 trendGuidePopUpDesc: _.get(result[6].data, 'trendGuidePopUpDesc', ''),
177 bannerSrc: _.get(result[7], 'data[0].src', '') 177 bannerSrc: _.get(result[7], 'data[0].src', '')
178 }); 178 });
@@ -252,7 +252,7 @@ const myDetails = (uid) => { @@ -252,7 +252,7 @@ const myDetails = (uid) => {
252 uname: _.get(result[0], 'data.nickname', ''), 252 uname: _.get(result[0], 'data.nickname', ''),
253 vip: _.get(result[0], 'data.vip_info.cur_level') 253 vip: _.get(result[0], 'data.vip_info.cur_level')
254 }); 254 });
255 - result[0].data.trendWorld = _.get(result[1].data, 'trendWorld', false); 255 + result[0].data.trendWord = _.get(result[1].data, 'trendWord', false);
256 result[0].data.inviteCode = _.get(result[1].data, 'inviteCode', false); 256 result[0].data.inviteCode = _.get(result[1].data, 'inviteCode', false);
257 } 257 }
258 258
@@ -14,14 +14,14 @@ @@ -14,14 +14,14 @@
14 14
15 <div class="invition"> 15 <div class="invition">
16 <span class="code trend-code"> 16 <span class="code trend-code">
17 - {{#if trendWorld}}  
18 - # {{trendWorld}} # 17 + {{#if trendWord}}
  18 + # {{trendWord}} #
19 {{else}} 19 {{else}}
20 {{inviteCode}} 20 {{inviteCode}}
21 {{/if}} 21 {{/if}}
22 </span> 22 </span>
23 <span class="code-set"></span> 23 <span class="code-set"></span>
24 - {{#unless trendWorld}} 24 + {{#unless trendWord}}
25 <span class="code-tip"></span> 25 <span class="code-tip"></span>
26 {{/unless}} 26 {{/unless}}
27 </div> 27 </div>
@@ -27,16 +27,15 @@ @@ -27,16 +27,15 @@
27 <span>我的潮流口令</span> 27 <span>我的潮流口令</span>
28 <span> 28 <span>
29 <a href="//m.yohobuy.com/home/tide-command" class="command"> 29 <a href="//m.yohobuy.com/home/tide-command" class="command">
30 - {{#if trendWorld}}  
31 - {{trendWorld}} 30 + {{#if trendWord}}
  31 + {{trendWord}}
32 {{else}} 32 {{else}}
33 {{inviteCode}} 33 {{inviteCode}}
34 {{/if}} 34 {{/if}}
35 <span class="iconfont">&#xe604;</span> 35 <span class="iconfont">&#xe604;</span>
36 </a> 36 </a>
37 </span> 37 </span>
38 - {{log trendWorld}}  
39 - {{#unless trendWorld}} 38 + {{#unless trendWord}}
40 <b class="tip"></b> 39 <b class="tip"></b>
41 {{/unless}} 40 {{/unless}}
42 </li> 41 </li>
1 <div class="tide-command-page yoho-page"> 1 <div class="tide-command-page yoho-page">
2 {{# invitionDta}} 2 {{# invitionDta}}
3 - <textarea name="" class="command-textarea" id="command-textarea" placeholder="请设置15位字符以内的潮流口令">{{#if trendWorld}}{{trendWorld}}{{/if}}</textarea> 3 + <div class="set-world">
  4 + <textarea name="" class="command-textarea" id="command-textarea" placeholder="请设置15位字符以内的潮流口令">{{#if trendWord}}{{trendWord}}{{/if}}</textarea>
  5 + </div>
4 6
5 <span class="world-number">15</span> 7 <span class="world-number">15</span>
6 8
1 -<div class="set-trend-world set-trend-hide{{#if trendWorld}} trend-world{{/if}}"> 1 +<div class="set-trend-world set-trend-hide{{#if trendWord}} trend-world{{/if}}">
2 <div class="back"></div> 2 <div class="back"></div>
3 <div class="set-content"> 3 <div class="set-content">
4 <div class="banner"> 4 <div class="banner">
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 </div> 6 </div>
7 <div class="main"> 7 <div class="main">
8 <div class="title"></div> 8 <div class="title"></div>
9 - <textarea type="text" class="trend-world-area trend-code" placeholder="请设置15字以内的潮流口令">{{#if trendWorld}}{{trendWorld}}{{/if}}</textarea> 9 + <textarea type="text" class="trend-world-area trend-code" placeholder="请设置15字以内的潮流口令">{{#if trendWord}}{{trendWord}}{{/if}}</textarea>
10 <div class="explain"> 10 <div class="explain">
11 <span class="explain-title">玩转潮流口令，超值福利等你拿</span> 11 <span class="explain-title">玩转潮流口令，超值福利等你拿</span>
12 <div class="show-explain"> 12 <div class="show-explain">

249 Bytes | W: | H:

1.33 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
@@ -2,6 +2,11 @@ @@ -2,6 +2,11 @@
2 width: 100%; 2 width: 100%;
3 height: 100%; 3 height: 100%;
4 position: relative; 4 position: relative;
  5 + background-color: #f0f0f0;
  6 +
  7 + .set-world {
  8 + background-color: #fff;
  9 + }
5 10
6 .command-textarea { 11 .command-textarea {
7 height: 130px; 12 height: 130px;
@@ -24,7 +29,6 @@ @@ -24,7 +29,6 @@
24 } 29 }
25 30
26 .introduce { 31 .introduce {
27 - background-color: #f0f0f0;  
28 padding-top: 15px; 32 padding-top: 15px;
29 } 33 }
30 34
@@ -34,6 +38,7 @@ @@ -34,6 +38,7 @@
34 font-size: 24px; 38 font-size: 24px;
35 background-color: #fff; 39 background-color: #fff;
36 padding: 0 54px; 40 padding: 0 54px;
  41 + margin-bottom: 30px;
37 42
38 .title { 43 .title {
39 line-height: 76px; 44 line-height: 76px;