Authored by hongyong.zhao

Merge branch 'feature/pcurl' into 'master'

Feature/pcurl



See merge request !439
<div class="link-about-page about-page center-content yoho-page">
<div class="about-nav right">
<ul>
<li><a href="/yohobuy.html">关于YOHO!BUY 有货</a></li>
<li><a href="/newpower.html">关于新力传媒</a></li>
<li><a href="/contact.html">联系我们</a></li>
<li><a href="/privacy.html">隐私条款</a></li>
<li class="act"><a>友情链接</a></li>
</ul>
</div>
<div class="main-container">
<div class="text-title">友情链接</div>
<div class="text-info">
<br>
<br>
<h2>文字链接:</h2>
<ul class="link-text clearfix">
{{# textLinks}}
<li><a href="{{link}}" target="_blank">{{name}}</a></li>
{{/ textLinks}}
</ul>
<h2>图片链接:</h2>
<ul class="link-img clearfix">
{{# imgLinks}}
<li>
<a href="{{link}}" target="_blank">
<img src="{{img}}" title="{{name}}" alt="{{name}}">
</a>
</li>
{{/ imgLinks}}
</ul>
<div class="link-apply">
<p>
友情链接要求:<br>
1、违反我国现行法律的或含有令人不愉快内容的网站勿扰。<br>
2、百度收录量大于5万,来自百度的日流量大于1万(以爱站数据为准)。<br>
3、百度权重值大于等于5。<br><br>
欢迎交换友情链接,请通过以下方式联系。<br>
QQ :2413949472(标注交换链接,带上网址)
</p>
</div>
</div>
</div>
</div>
<div class="link-about-page about-page center-content yoho-page">
<div class="about-nav right">
<ul>
<li><a href="/yohobuy.html">关于YOHO!BUY 有货</a></li>
<li><a href="/newpower.html">关于新力传媒</a></li>
<li><a href="/contact.html">联系我们</a></li>
<li><a href="/privacy.html">隐私条款</a></li>
<li class="act"><a>友情链接</a></li>
</ul>
</div>
<div class="main-container">
<div class="text-title">友情链接</div>
<div class="text-info">
<br>
<br>
<h2>文字链接:</h2>
<ul class="link-text clearfix">
{{# textLinks}}
<li><a href="{{link}}" target="_blank">{{name}}</a></li>
{{/ textLinks}}
</ul>
<h2>图片链接:</h2>
<ul class="link-img clearfix">
{{# imgLinks}}
<li>
<a href="{{link}}" target="_blank">
<img src="{{img}}" title="{{name}}" alt="{{name}}">
</a>
</li>
{{/ imgLinks}}
</ul>
<div class="link-apply">
<p>
友情链接要求:<br>
1、违反我国现行法律的或含有令人不愉快内容的网站勿扰。<br>
2、百度收录量大于5万,来自百度的日流量大于1万(以爱站数据为准)。<br>
3、百度权重值大于等于5。<br><br>
欢迎交换友情链接,请通过以下方式联系。<br>
QQ :963450257(标注交换链接,带上网址)
</p>
</div>
</div>
</div>
</div>
... ...
... ... @@ -287,7 +287,7 @@ module.exports = class extends global.yoho.BaseModel {
}
resData.headerData.hotTerms = _.map(_.get(res[1], 'data.hotTerms', []), (value) => {
return {
href: helpers.urlFormat('', {query: value.content}, 'search'),
href: _.get(value, 'pcUrl') || helpers.urlFormat('', {query: value.content}, 'search'),
content: value.content,
sort: value.sort,
status: value.status,
... ...
... ... @@ -1157,8 +1157,8 @@ babylon@^6.17.3, babylon@^6.18.0:
resolved "http://npm.yohops.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
babylon@^7.0.0-beta.47:
version "7.0.0-beta.0-ranges"
resolved "http://npm.yohops.com/babylon/-/babylon-7.0.0-beta.0-ranges.tgz#b2aee8b19d9d2dd33bebc041e152f1ca4794eb05"
version "7.0.0-beta.47"
resolved "http://npm.yohops.com/babylon/-/babylon-7.0.0-beta.47.tgz#6d1fa44f0abec41ab7c780481e62fd9aafbdea80"
bail@^1.0.0:
version "1.0.3"
... ... @@ -1600,7 +1600,7 @@ caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000856:
capture-stack-trace@^1.0.0:
version "1.0.1"
resolved "http://npm.yohops.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#ed0a1edb87c05d4db1037c5f8f483d8a3b5f0825"
resolved "http://npm.yohops.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
caseless@~0.12.0:
version "0.12.0"
... ... @@ -3024,7 +3024,7 @@ escope@^3.6.0:
eslint-config-yoho@1.0.9:
version "1.0.9"
resolved "http://npm.yohops.com/eslint-config-yoho/-/eslint-config-yoho-1.0.9.tgz#973f7810b1e0e09b66061defd477e2144d2fdcbb"
resolved "http://npm.yohops.com/eslint-config-yoho/-/eslint-config-yoho-1.0.9.tgz#430d5417edb83840534c2e1824885e647e2c5ee9"
eslint-loader@^1.6.3:
version "1.9.0"
... ...