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 @@ @@ -2,24 +2,18 @@
2 2
3 const urlEncode = require('urlencode'); 3 const urlEncode = require('urlencode');
4 const _ = require('lodash'); 4 const _ = require('lodash');
5 -const helpers = global.yoho.helpers;  
6 5
7 module.exports = (req, res, next) => { 6 module.exports = (req, res, next) => {
8 let query = _.trim(req.query.query); 7 let query = _.trim(req.query.query);
9 - let subDomain = req.subdomains[0];  
10 8
11 if (query) { 9 if (query) {
12 try { 10 try {
13 - decodeURIComponent(query);  
14 - return next(); 11 + query = urlEncode.decode(query);
15 } catch (e) { 12 } catch (e) {
16 try { 13 try {
17 - query = urlEncode.decode(query, 'gb2312'); 14 + query = urlEncode.decode(query, 'gbk');
18 req.query.query = query; 15 req.query.query = query;
19 - return res.status(301).redirect(helpers.urlFormat('', req.query, subDomain));  
20 - } catch (e1) {  
21 - return res.redirect(helpers.urlFormat('', null, subDomain));  
22 - } 16 + } catch (e1) {} // eslint-disable-line
23 } 17 }
24 } 18 }
25 19
@@ -147,16 +147,16 @@ @@ -147,16 +147,16 @@
147 <span>新手专区</span> 147 <span>新手专区</span>
148 </p> 148 </p>
149 <p> 149 <p>
150 - <a href="//www.yohobuy.com/help/detail?id=25" target="_blank" rel="nofollow">注册登录</a> 150 + <a href="//www.yohobuy.com/help/detail?id=168" target="_blank" rel="nofollow">注册登录</a>
151 </p> 151 </p>
152 <p> 152 <p>
153 - <a href="//www.yohobuy.com/help/detail?id=27" target="_blank" rel="nofollow">购物结算</a> 153 + <a href="//www.yohobuy.com/help/detail?id=170" target="_blank" rel="nofollow">购物结算</a>
154 </p> 154 </p>
155 <p> 155 <p>
156 - <a href="//www.yohobuy.com/help/detail?id=29" target="_blank" rel="nofollow">下单支付</a> 156 + <a href="//www.yohobuy.com/help/detail?id=172" target="_blank" rel="nofollow">下单支付</a>
157 </p> 157 </p>
158 <p> 158 <p>
159 - <a href="//www.yohobuy.com/help/detail?id=31" target="_blank" rel="nofollow">收货评价</a> 159 + <a href="//www.yohobuy.com/help/detail?id=174" target="_blank" rel="nofollow">收货评价</a>
160 </p> 160 </p>
161 </li> 161 </li>
162 <li class="left"> 162 <li class="left">
@@ -164,16 +164,16 @@ @@ -164,16 +164,16 @@
164 <span>会员中心</span> 164 <span>会员中心</span>
165 </p> 165 </p>
166 <p> 166 <p>
167 - <a href="//www.yohobuy.com/help/detail?id=7" target="_blank" rel="nofollow">会员制度</a> 167 + <a href="//www.yohobuy.com/help/detail?id=156" target="_blank" rel="nofollow">会员制度</a>
168 </p> 168 </p>
169 <p> 169 <p>
170 - <a href="//www.yohobuy.com/help/detail?id=9" target="_blank" rel="nofollow">会员优惠</a> 170 + <a href="//www.yohobuy.com/help/detail?id=158" target="_blank" rel="nofollow">会员优惠</a>
171 </p> 171 </p>
172 <p> 172 <p>
173 - <a href="//www.yohobuy.com/help/detail?id=11" target="_blank" rel="nofollow">账户管理</a> 173 + <a href="//www.yohobuy.com/help/detail?id=160" target="_blank" rel="nofollow">账户管理</a>
174 </p> 174 </p>
175 <p> 175 <p>
176 - <a href="//www.yohobuy.com/help/detail?id=13" target="_blank" rel="nofollow">密码管理</a> 176 + <a href="//www.yohobuy.com/help/detail?id=162" target="_blank" rel="nofollow">密码管理</a>
177 </p> 177 </p>
178 </li> 178 </li>
179 <li class="left"> 179 <li class="left">
@@ -181,16 +181,16 @@ @@ -181,16 +181,16 @@
181 <span>购物指南</span> 181 <span>购物指南</span>
182 </p> 182 </p>
183 <p> 183 <p>
184 - <a href="//www.yohobuy.com/help/detail?id=33" target="_blank" rel="nofollow">发票</a> 184 + <a href="//www.yohobuy.com/help/detail?id=180" target="_blank" rel="nofollow">发票</a>
185 </p> 185 </p>
186 <p> 186 <p>
187 - <a href="//www.yohobuy.com/help/detail?id=35" target="_blank" rel="nofollow">尺码对照</a> 187 + <a href="//www.yohobuy.com/help/detail?id=182" target="_blank" rel="nofollow">尺码对照</a>
188 </p> 188 </p>
189 <p> 189 <p>
190 - <a href="//www.yohobuy.com/help/detail?id=37" target="_blank" rel="nofollow">尺码解读</a> 190 + <a href="//www.yohobuy.com/help/detail?id=184" target="_blank" rel="nofollow">尺码解读</a>
191 </p> 191 </p>
192 <p> 192 <p>
193 - <a href="//www.yohobuy.com/help/detail?id=39" target="_blank" rel="nofollow">商品咨询</a> 193 + <a href="//www.yohobuy.com/help/detail?id=186" target="_blank" rel="nofollow">商品咨询</a>
194 </p> 194 </p>
195 </li> 195 </li>
196 <li class="left"> 196 <li class="left">
@@ -198,16 +198,16 @@ @@ -198,16 +198,16 @@
198 <span>支付方式</span> 198 <span>支付方式</span>
199 </p> 199 </p>
200 <p> 200 <p>
201 - <a href="//www.yohobuy.com/help/detail?id=43" target="_blank" rel="nofollow">在线支付</a> 201 + <a href="//www.yohobuy.com/help/detail?id=192" target="_blank" rel="nofollow">在线支付</a>
202 </p> 202 </p>
203 <p> 203 <p>
204 - <a href="//www.yohobuy.com/help/detail?id=45" target="_blank" rel="nofollow">货到付款</a> 204 + <a href="//www.yohobuy.com/help/detail?id=194" target="_blank" rel="nofollow">货到付款</a>
205 </p> 205 </p>
206 <p> 206 <p>
207 - <a href="//www.yohobuy.com/help/detail?id=47" target="_blank" rel="nofollow">分期支付</a> 207 + <a href="//www.yohobuy.com/help/detail?id=196" target="_blank" rel="nofollow">分期支付</a>
208 </p> 208 </p>
209 <p> 209 <p>
210 - <a href="//www.yohobuy.com/help/detail?id=105" target="_blank" rel="nofollow">优惠券、有货币</a> 210 + <a href="//www.yohobuy.com/help/detail?id=198" target="_blank" rel="nofollow">优惠券、有货币</a>
211 </p> 211 </p>
212 </li> 212 </li>
213 <li class="left"> 213 <li class="left">
@@ -215,16 +215,16 @@ @@ -215,16 +215,16 @@
215 <span>配送方式</span> 215 <span>配送方式</span>
216 </p> 216 </p>
217 <p> 217 <p>
218 - <a href="//www.yohobuy.com/help/detail?id=109" target="_blank" rel="nofollow">配送说明</a> 218 + <a href="//www.yohobuy.com/help/detail?id=204" target="_blank" rel="nofollow">配送说明</a>
219 </p> 219 </p>
220 <p> 220 <p>
221 - <a href="//www.yohobuy.com/help/detail?id=111" target="_blank" rel="nofollow">运费说明</a> 221 + <a href="//www.yohobuy.com/help/detail?id=206" target="_blank" rel="nofollow">运费说明</a>
222 </p> 222 </p>
223 <p> 223 <p>
224 - <a href="//www.yohobuy.com/help/detail?id=113" target="_blank" rel="nofollow">验货签收</a> 224 + <a href="//www.yohobuy.com/help/detail?id=208" target="_blank" rel="nofollow">验货签收</a>
225 </p> 225 </p>
226 <p> 226 <p>
227 - <a href="//www.yohobuy.com/help/detail?id=115" target="_blank" rel="nofollow">收货样品</a> 227 + <a href="//www.yohobuy.com/help/detail?id=210" target="_blank" rel="nofollow">收货样品</a>
228 </p> 228 </p>
229 </li> 229 </li>
230 <li class="left"> 230 <li class="left">
@@ -232,13 +232,13 @@ @@ -232,13 +232,13 @@
232 <span>售后服务</span> 232 <span>售后服务</span>
233 </p> 233 </p>
234 <p> 234 <p>
235 - <a href="//www.yohobuy.com/help/detail?id=49" target="_blank" rel="nofollow">退换货政策</a> 235 + <a href="//www.yohobuy.com/help/detail?id=214" target="_blank" rel="nofollow">退换货政策</a>
236 </p> 236 </p>
237 <p> 237 <p>
238 - <a href="//www.yohobuy.com/help/detail?id=51" target="_blank" rel="nofollow">退换货流程</a> 238 + <a href="//www.yohobuy.com/help/detail?id=216" target="_blank" rel="nofollow">退换货流程</a>
239 </p> 239 </p>
240 <p> 240 <p>
241 - <a href="//www.yohobuy.com/help/detail?id=55" target="_blank" rel="nofollow">投诉与建议</a> 241 + <a href="//www.yohobuy.com/help/detail?id=220" target="_blank" rel="nofollow">投诉与建议</a>
242 </p> 242 </p>
243 <p> 243 <p>
244 <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> 244 <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 @@ @@ -249,16 +249,16 @@
249 <span>APP常见问题</span> 249 <span>APP常见问题</span>
250 </p> 250 </p>
251 <p> 251 <p>
252 - <a href="//www.yohobuy.com/help/detail?id=57" target="_blank" rel="nofollow">IPhone版</a> 252 + <a href="//www.yohobuy.com/help/detail?id=224" target="_blank" rel="nofollow">IPhone版</a>
253 </p> 253 </p>
254 <p> 254 <p>
255 - <a href="//www.yohobuy.com/help/detail?id=59" target="_blank" rel="nofollow">Android版</a> 255 + <a href="//www.yohobuy.com/help/detail?id=226" target="_blank" rel="nofollow">Android版</a>
256 </p> 256 </p>
257 <p> 257 <p>
258 - <a href="//www.yohobuy.com/help/detail?id=61" target="_blank" rel="nofollow">wap版</a> 258 + <a href="//www.yohobuy.com/help/detail?id=228" target="_blank" rel="nofollow">wap版</a>
259 </p> 259 </p>
260 <p> 260 <p>
261 - <a href="//www.yohobuy.com/help/detail?id=63" target="_blank" rel="nofollow">IPAD版</a> 261 + <a href="//www.yohobuy.com/help/detail?id=230" target="_blank" rel="nofollow">IPAD版</a>
262 </p> 262 </p>
263 </li> 263 </li>
264 </ul> 264 </ul>
1 { 1 {
2 "name": "yohobuy-node", 2 "name": "yohobuy-node",
3 - "version": "6.1.24", 3 + "version": "6.1.25",
4 "private": true, 4 "private": true,
5 "description": "A New Yohobuy Project With Express", 5 "description": "A New Yohobuy Project With Express",
6 "repository": { 6 "repository": {
@@ -31,7 +31,7 @@ function randomString(len) { @@ -31,7 +31,7 @@ function randomString(len) {
31 } 31 }
32 32
33 function loadTogetherProduct(params) { 33 function loadTogetherProduct(params) {
34 - var that = this; 34 + var that = this || window;
35 35
36 capi.getTogetherProduct(params).done(function(togetherInfo) { 36 capi.getTogetherProduct(params).done(function(togetherInfo) {
37 var _content; 37 var _content;
@@ -164,7 +164,7 @@ function couponAlert(opt) { @@ -164,7 +164,7 @@ function couponAlert(opt) {
164 164
165 // 领取优惠券 165 // 领取优惠券
166 function pickCoupon(info) { 166 function pickCoupon(info) {
167 - var that = this; 167 + var that = this || window;
168 168
169 if (that.picking || !info.id) { 169 if (that.picking || !info.id) {
170 return; 170 return;