Showing
9 changed files
with
15 additions
and
20 deletions
@@ -100,7 +100,8 @@ exports.friendInvite = (req, res, next) => { | @@ -100,7 +100,8 @@ exports.friendInvite = (req, res, next) => { | ||
100 | let page = req.query.page || 1; | 100 | let page = req.query.page || 1; |
101 | let isApp = req.yoho.isApp; | 101 | let isApp = req.yoho.isApp; |
102 | let inciteCode = req.query.inviteCode; | 102 | let inciteCode = req.query.inviteCode; |
103 | - let contentCode = req.app.locals.isProduction ? '319f92c4b072c3c40ea4cb4499b78bb4' : 'bc31b5d58b5af4e3999e8b994fb2bbc1'; | 103 | + let contentCode = req.app.locals.isProduction ? '319f92c4b072c3c40ea4cb4499b78bb4' : |
104 | + 'bc31b5d58b5af4e3999e8b994fb2bbc1'; | ||
104 | 105 | ||
105 | req.ctx(expandModel).friendInvite(inciteCode, yhChannel, limit, page, contentCode).then(result => { | 106 | req.ctx(expandModel).friendInvite(inciteCode, yhChannel, limit, page, contentCode).then(result => { |
106 | res.render('expand-new/friend-invite', { | 107 | res.render('expand-new/friend-invite', { |
@@ -5,7 +5,8 @@ const tideCommandModel = require('../models/tide-command'); | @@ -5,7 +5,8 @@ const tideCommandModel = require('../models/tide-command'); | ||
5 | 5 | ||
6 | exports.tideCommand = (req, res, next) => { | 6 | exports.tideCommand = (req, res, next) => { |
7 | let uid = req.user.uid, | 7 | let uid = req.user.uid, |
8 | - contentCode = req.app.locals.isProduction ? '29958987ef0c0f830fad03d7e54f6061' : '29958987ef0c0f830fad03d7e5'; | 8 | + contentCode = req.app.locals.isProduction ? '29958987ef0c0f830fad03d7e54f6061' : |
9 | + '29958987ef0c0f830fad03d7e5'; | ||
9 | 10 | ||
10 | req.ctx(tideCommandModel).invitionData(uid, contentCode).then(result => { | 11 | req.ctx(tideCommandModel).invitionData(uid, contentCode).then(result => { |
11 | res.render('tide-command', { | 12 | res.render('tide-command', { |
@@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
22 | </span> | 22 | </span> |
23 | <span class="code-set"></span> | 23 | <span class="code-set"></span> |
24 | {{#unless trendWorld}} | 24 | {{#unless trendWorld}} |
25 | - <span class="code-tip">潮流口令</span> | 25 | + <span class="code-tip"></span> |
26 | {{/unless}} | 26 | {{/unless}} |
27 | </div> | 27 | </div> |
28 | <div class="iconfont more-icon tap-hightlight"></div> | 28 | <div class="iconfont more-icon tap-hightlight"></div> |
@@ -35,8 +35,9 @@ | @@ -35,8 +35,9 @@ | ||
35 | <span class="iconfont"></span> | 35 | <span class="iconfont"></span> |
36 | </a> | 36 | </a> |
37 | </span> | 37 | </span> |
38 | + {{log trendWorld}} | ||
38 | {{#unless trendWorld}} | 39 | {{#unless trendWorld}} |
39 | - <b class="tip">新玩法</b> | 40 | + <b class="tip"></b> |
40 | {{/unless}} | 41 | {{/unless}} |
41 | </li> | 42 | </li> |
42 | </ul> | 43 | </ul> |
public/img/home/index/clkl.png
0 → 100644
2.29 KB
public/img/home/index/code-tip.png
deleted
100644 → 0
3.67 KB
public/img/home/index/xwf.png
0 → 100644
2.14 KB
@@ -116,21 +116,16 @@ | @@ -116,21 +116,16 @@ | ||
116 | } | 116 | } |
117 | 117 | ||
118 | .code-tip { | 118 | .code-tip { |
119 | - margin-left: 8px; | ||
120 | - width: 112px; | ||
121 | - height: 30px; | ||
122 | - background: url("/home/index/code-tip.png"); | 119 | + margin-left: 4px; |
120 | + width: 94px; | ||
121 | + height: 26px; | ||
122 | + background: url("/home/index/clkl.png"); | ||
123 | background-size: 100%; | 123 | background-size: 100%; |
124 | background-repeat: no-repeat; | 124 | background-repeat: no-repeat; |
125 | display: block; | 125 | display: block; |
126 | float: right; | 126 | float: right; |
127 | - font-size: 18px; | ||
128 | - line-height: 28px; | ||
129 | - text-align: center; | ||
130 | position: relative; | 127 | position: relative; |
131 | - top: 8px; | ||
132 | - padding-left: 13px; | ||
133 | - border-radius: 5px; | 128 | + top: 12px; |
134 | } | 129 | } |
135 | } | 130 | } |
136 | } | 131 | } |
@@ -94,19 +94,16 @@ | @@ -94,19 +94,16 @@ | ||
94 | } | 94 | } |
95 | 95 | ||
96 | .tip { | 96 | .tip { |
97 | - background: url("/home/index/code-tip.png"); | 97 | + background: url("/home/index/xwf.png"); |
98 | background-size: 100%; | 98 | background-size: 100%; |
99 | background-repeat: no-repeat; | 99 | background-repeat: no-repeat; |
100 | - width: 85px; | 100 | + width: 74px; |
101 | height: 26px; | 101 | height: 26px; |
102 | display: inline-block; | 102 | display: inline-block; |
103 | - font-size: 14px; | ||
104 | color: #fff; | 103 | color: #fff; |
105 | position: relative; | 104 | position: relative; |
106 | - top: -58px; | 105 | + top: -52px; |
107 | left: 205px; | 106 | left: 205px; |
108 | - padding-left: 17px; | ||
109 | - border-radius: 5px; | ||
110 | } | 107 | } |
111 | 108 | ||
112 | .command { | 109 | .command { |
-
Please register or login to post a comment