fe / yohobuy-node · Commits

Go to a project

Authored by 陈峰
Commit a17566c198fe3f1b6ffda6c9d9db718dbd0f2169 2 parents f4a20ec0 9f192b99

Merge branch 'hotfix/fixInfo' into 'master' 

Hotfix/fix info



See merge request !220
Inline Side-by-side
Showing 4 changed files with 8 additions and 8 deletions
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 3、百度权重值大于等于5。<br><br> 38 3、百度权重值大于等于5。<br><br>
39 39
40 欢迎交换友情链接，请通过以下方式联系。<br> 40 欢迎交换友情链接，请通过以下方式联系。<br>
41 - QQ :1092657603(标注交换链接，带上网址） 41 + QQ :156030336(标注交换链接，带上网址）
42 </p> 42 </p>
43 </div> 43 </div>
44 </div> 44 </div>
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 {{#if suggest}} 73 {{#if suggest}}
74 {{#unless changedQuery}} 74 {{#unless changedQuery}}
75 <div class="search-suggest-less"> 75 <div class="search-suggest-less">
76 - <em>"{{name}}"</em>&nbsp;搜索结果太少了，试试{{#suggest}}&nbsp;"<a href="/?query={{.}}&is_rec=Y">{{.}}</a>"&nbsp;{{/suggest}}关键词搜索 76 + <em>"{{name}}"</em>&nbsp;搜索结果太少了，试试{{#suggest}}&nbsp;"<a href="/search?query={{.}}&is_rec=Y">{{.}}</a>"&nbsp;{{/suggest}}关键词搜索
77 </div> 77 </div>
78 {{/unless}} 78 {{/unless}}
79 {{/if}} 79 {{/if}}
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 {{#if changedQuery}} 82 {{#if changedQuery}}
83 <div class="search-suggest-less"> 83 <div class="search-suggest-less">
84 没有找到&nbsp;<em>"{{name}}"</em>&nbsp;相关的商品， 84 没有找到&nbsp;<em>"{{name}}"</em>&nbsp;相关的商品，
85 - 为您推荐&nbsp;"<a href="/?query={{suggestFirst}}&is_rec=Y" id="rec-query-key">{{suggestFirst}}</a>"&nbsp;的搜索结果。{{#if suggestSecond}}或者试试{{#suggestSecond}}&nbsp;"<a href="/?query={{.}}&is_rec=Y">{{.}}</a>"&nbsp;{{/suggestSecond}}{{/if}} 85 + 为您推荐&nbsp;"<a href="/?query={{suggestFirst}}&is_rec=Y" id="rec-query-key">{{suggestFirst}}</a>"&nbsp;的搜索结果。{{#if suggestSecond}}或者试试{{#suggestSecond}}&nbsp;"<a href="/search?query={{.}}&is_rec=Y">{{.}}</a>"&nbsp;{{/suggestSecond}}{{/if}}
86 </div> 86 </div>
87 {{/if}} 87 {{/if}}
88 88
@@ -36,9 +36,9 @@ const getMenuData = () => ( @@ -36,9 +36,9 @@ const getMenuData = () => (
36 cn: '女生潮流', 36 cn: '女生潮流',
37 en: 'YOHO!GIRLS' 37 en: 'YOHO!GIRLS'
38 }, { 38 }, {
39 - link: 'http://www.yohoshow.com',  
40 - cn: '物趣分享',  
41 - en: 'YOHO!SHOW' 39 + link: 'http://www.yohomars.com',
  40 + cn: '新鲜好去处',
  41 + en: 'Mars'
42 }, { 42 }, {
43 link: 'http://www.yohood.cn', 43 link: 'http://www.yohood.cn',
44 cn: '潮流嘉年华', 44 cn: '潮流嘉年华',
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div id="yoho-header" class="yoho-header" data-type="{{headType}}"> 2 <div id="yoho-header" class="yoho-header" data-type="{{headType}}">
3 <div class="tool-wrapper clearfix" data-role="tool-wrapper"> 3 <div class="tool-wrapper clearfix" data-role="tool-wrapper">
4 <div class="center-content"> 4 <div class="center-content">
5 - <!--<div class="yoho-group-map left"> 5 + <div class="yoho-group-map left">
6 <span class="icon-hamburger"></span> 6 <span class="icon-hamburger"></span>
7 <a href="//www.yohobuy.com"{{#if @root.pageNoFollow}} rel="nofollow"{{/if}}>YOHO!BUY 有货</a> 7 <a href="//www.yohobuy.com"{{#if @root.pageNoFollow}} rel="nofollow"{{/if}}>YOHO!BUY 有货</a>
8 {{#if yohoGroup}} 8 {{#if yohoGroup}}
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 {{/ yohoGroup}} 14 {{/ yohoGroup}}
15 </ul> 15 </ul>
16 {{/if}} 16 {{/if}}
17 - </div>--> 17 + </div>
18 <div class="left swindle-info"> 18 <div class="left swindle-info">
19 <span class="icon-note"></span> 19 <span class="icon-note"></span>
20 <a href="//www.yohobuy.com/help/detail?id=103&contId=147" rel="nofollow" target="_blank"> 20 <a href="//www.yohobuy.com/help/detail?id=103&contId=147" rel="nofollow" target="_blank">