Merge remote-tracking branch 'origin/feature/expandNewTrend' into feature/gray

@@ -25,6 +25,7 @@ module.exports = class extends global.yoho.BaseModel {
 
                 result.data.isApp = isApp;
 
+                result.data.copyCode = result.data.trendWord ? result.data.trendWord : result.data.inviteCode;
                 result.data.copyUrl = result.data.shareUrl ?
                     result.data.shareUrl.replace(/"/g, '"').replace(/=/g, ':') : '';
 

@@ -16,7 +16,7 @@
                 <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>
+                    <a class="copy button" href='//m.yohobuy.com/?openby:yohobuy={"action":"go.copy","params":{"text":"{{copyCode}}","message":"复制成功"}}'>复制</a>
                 {{/if}}
             </div>
             <p class="info">1.复制您的潮流口令 2.粘贴给您的朋友（微信/短信等方式）</p>

@@ -586,11 +586,11 @@ const getSearchKeywordData = (params, uid) => {
 
 const getSearchKeywordDataById = (id, params, uid) => {
     return redis.all([
-        ['get', `golobal:yoho:seo:keywords:id:${id}`]
+        ['get', `global:yoho:seo:keywords:id:${id}`]
     ]).then(redisData => {
         if (!redisData[0]) {
             return Promise.reject('get redis canpin keywords by id error!' +
-                `key: golobal:yoho:seo:keywords:id:${id} value: ${redisData[0]}`);
+                `key: global:yoho:seo:keywords:id:${id} value: ${redisData[0]}`);
         }
 
         redisData = JSON.parse(redisData[0]);