fe / yohobuy-node · Commits

Go to a project

Authored by 陈峰
Commit 46e569650330667e145505c71dc6209382417b65 2 parents 8337f43a 5eb1c699

Merge branch 'hotfix/search' into 'master' 

Hotfix/search



See merge request !226
Inline Side-by-side
Showing 5 changed files with 33 additions and 39 deletions
... ... @@ -2,24 +2,18 @@
const urlEncode = require('urlencode');
const _ = require('lodash');
const helpers = global.yoho.helpers;
module.exports = (req, res, next) => {
let query = _.trim(req.query.query);
let subDomain = req.subdomains[0];
if (query) {
try {
decodeURIComponent(query);
return next();
query = urlEncode.decode(query);
} catch (e) {
try {
query = urlEncode.decode(query, 'gb2312');
query = urlEncode.decode(query, 'gbk');
req.query.query = query;
return res.status(301).redirect(helpers.urlFormat('', req.query, subDomain));
} catch (e1) {
return res.redirect(helpers.urlFormat('', null, subDomain));
}
} catch (e1) {} // eslint-disable-line
}
}
... ...
... ... @@ -147,16 +147,16 @@
<span>新手专区</span>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=25" target="_blank" rel="nofollow">注册登录</a>
<a href="//www.yohobuy.com/help/detail?id=168" target="_blank" rel="nofollow">注册登录</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=27" target="_blank" rel="nofollow">购物结算</a>
<a href="//www.yohobuy.com/help/detail?id=170" target="_blank" rel="nofollow">购物结算</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=29" target="_blank" rel="nofollow">下单支付</a>
<a href="//www.yohobuy.com/help/detail?id=172" target="_blank" rel="nofollow">下单支付</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=31" target="_blank" rel="nofollow">收货评价</a>
<a href="//www.yohobuy.com/help/detail?id=174" target="_blank" rel="nofollow">收货评价</a>
</p>
</li>
<li class="left">
... ... @@ -164,16 +164,16 @@
<span>会员中心</span>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=7" target="_blank" rel="nofollow">会员制度</a>
<a href="//www.yohobuy.com/help/detail?id=156" target="_blank" rel="nofollow">会员制度</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=9" target="_blank" rel="nofollow">会员优惠</a>
<a href="//www.yohobuy.com/help/detail?id=158" target="_blank" rel="nofollow">会员优惠</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=11" target="_blank" rel="nofollow">账户管理</a>
<a href="//www.yohobuy.com/help/detail?id=160" target="_blank" rel="nofollow">账户管理</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=13" target="_blank" rel="nofollow">密码管理</a>
<a href="//www.yohobuy.com/help/detail?id=162" target="_blank" rel="nofollow">密码管理</a>
</p>
</li>
<li class="left">
... ... @@ -181,16 +181,16 @@
<span>购物指南</span>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=33" target="_blank" rel="nofollow">发票</a>
<a href="//www.yohobuy.com/help/detail?id=180" target="_blank" rel="nofollow">发票</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=35" target="_blank" rel="nofollow">尺码对照</a>
<a href="//www.yohobuy.com/help/detail?id=182" target="_blank" rel="nofollow">尺码对照</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=37" target="_blank" rel="nofollow">尺码解读</a>
<a href="//www.yohobuy.com/help/detail?id=184" target="_blank" rel="nofollow">尺码解读</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=39" target="_blank" rel="nofollow">商品咨询</a>
<a href="//www.yohobuy.com/help/detail?id=186" target="_blank" rel="nofollow">商品咨询</a>
</p>
</li>
<li class="left">
... ... @@ -198,16 +198,16 @@
<span>支付方式</span>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=43" target="_blank" rel="nofollow">在线支付</a>
<a href="//www.yohobuy.com/help/detail?id=192" target="_blank" rel="nofollow">在线支付</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=45" target="_blank" rel="nofollow">货到付款</a>
<a href="//www.yohobuy.com/help/detail?id=194" target="_blank" rel="nofollow">货到付款</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=47" target="_blank" rel="nofollow">分期支付</a>
<a href="//www.yohobuy.com/help/detail?id=196" target="_blank" rel="nofollow">分期支付</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=105" target="_blank" rel="nofollow">优惠券、有货币</a>
<a href="//www.yohobuy.com/help/detail?id=198" target="_blank" rel="nofollow">优惠券、有货币</a>
</p>
</li>
<li class="left">
... ... @@ -215,16 +215,16 @@
<span>配送方式</span>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=109" target="_blank" rel="nofollow">配送说明</a>
<a href="//www.yohobuy.com/help/detail?id=204" target="_blank" rel="nofollow">配送说明</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=111" target="_blank" rel="nofollow">运费说明</a>
<a href="//www.yohobuy.com/help/detail?id=206" target="_blank" rel="nofollow">运费说明</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=113" target="_blank" rel="nofollow">验货签收</a>
<a href="//www.yohobuy.com/help/detail?id=208" target="_blank" rel="nofollow">验货签收</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=115" target="_blank" rel="nofollow">收货样品</a>
<a href="//www.yohobuy.com/help/detail?id=210" target="_blank" rel="nofollow">收货样品</a>
</p>
</li>
<li class="left">
... ... @@ -232,13 +232,13 @@
<span>售后服务</span>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=49" target="_blank" rel="nofollow">退换货政策</a>
<a href="//www.yohobuy.com/help/detail?id=214" target="_blank" rel="nofollow">退换货政策</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=51" target="_blank" rel="nofollow">退换货流程</a>
<a href="//www.yohobuy.com/help/detail?id=216" target="_blank" rel="nofollow">退换货流程</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=55" target="_blank" rel="nofollow">投诉与建议</a>
<a href="//www.yohobuy.com/help/detail?id=220" target="_blank" rel="nofollow">投诉与建议</a>
</p>
<p>
<a href="{{#if @root.pc.clientService.new}}http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409{{else}}//www.yohobuy.com/service/client{{/if}}" target="_blank" rel="nofollow">在线客服</a>
... ... @@ -249,16 +249,16 @@
<span>APP常见问题</span>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=57" target="_blank" rel="nofollow">IPhone版</a>
<a href="//www.yohobuy.com/help/detail?id=224" target="_blank" rel="nofollow">IPhone版</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=59" target="_blank" rel="nofollow">Android版</a>
<a href="//www.yohobuy.com/help/detail?id=226" target="_blank" rel="nofollow">Android版</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=61" target="_blank" rel="nofollow">wap版</a>
<a href="//www.yohobuy.com/help/detail?id=228" target="_blank" rel="nofollow">wap版</a>
</p>
<p>
<a href="//www.yohobuy.com/help/detail?id=63" target="_blank" rel="nofollow">IPAD版</a>
<a href="//www.yohobuy.com/help/detail?id=230" target="_blank" rel="nofollow">IPAD版</a>
</p>
</li>
</ul>
... ...
{
"name": "yohobuy-node",
"version": "6.1.24",
"version": "6.1.25",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ...
... ... @@ -31,7 +31,7 @@ function randomString(len) {
}
function loadTogetherProduct(params) {
var that = this;
var that = this || window;
capi.getTogetherProduct(params).done(function(togetherInfo) {
var _content;
... ...
... ... @@ -164,7 +164,7 @@ function couponAlert(opt) {
// 领取优惠券
function pickCoupon(info) {
var that = this;
var that = this || window;
if (that.picking || !info.id) {
return;
... ...