|
@@ -26,6 +26,7 @@ const list = (req, res, next) => { |
|
@@ -26,6 +26,7 @@ const list = (req, res, next) => { |
26
|
let isQueryFirstClass = false; // 标识用户搜的是不是一级品类
|
26
|
let isQueryFirstClass = false; // 标识用户搜的是不是一级品类
|
27
|
let isQuerySecondClass = false; // 标识用户搜的是不是二级品类
|
27
|
let isQuerySecondClass = false; // 标识用户搜的是不是二级品类
|
28
|
let domain = null;
|
28
|
let domain = null;
|
|
|
29
|
+ let uid = req.user.uid || 0;
|
29
|
|
30
|
|
30
|
if (params.shop_id) {
|
31
|
if (params.shop_id) {
|
31
|
params.shopId = params.shop_id;
|
32
|
params.shopId = params.shop_id;
|
|
@@ -52,6 +53,10 @@ const list = (req, res, next) => { |
|
@@ -52,6 +53,10 @@ const list = (req, res, next) => { |
52
|
query = query.toLowerCase();
|
53
|
query = query.toLowerCase();
|
53
|
}
|
54
|
}
|
54
|
|
55
|
|
|
|
56
|
+ if (uid) {
|
|
|
57
|
+ initialData.uid = uid;
|
|
|
58
|
+ }
|
|
|
59
|
+
|
55
|
/* 判断是不是品牌, 是品牌跳到品牌列表页(显示搜索框),判断是不是品类, 是品类加导航标题(不显示搜索框) */
|
60
|
/* 判断是不是品牌, 是品牌跳到品牌列表页(显示搜索框),判断是不是品类, 是品类加导航标题(不显示搜索框) */
|
56
|
return Promise.all([
|
61
|
return Promise.all([
|
57
|
searchModel.getBrandDomain(query),
|
62
|
searchModel.getBrandDomain(query),
|
|
@@ -183,16 +188,26 @@ let fuzzyDatas = (req, res, next) => { |
|
@@ -183,16 +188,26 @@ let fuzzyDatas = (req, res, next) => { |
183
|
* ajax 商品数据请求
|
188
|
* ajax 商品数据请求
|
184
|
*/
|
189
|
*/
|
185
|
const search = (req, res, next) => {
|
190
|
const search = (req, res, next) => {
|
186
|
- res.header('Access-Control-Allow-Origin', '*');
|
191
|
+ let allowOrigin = _.get(req, 'headers.origin', null) ?
|
|
|
192
|
+ req.headers.origin : req.protocol + '://' + req.headers.host;
|
|
|
193
|
+
|
|
|
194
|
+ res.setHeader('Access-Control-Allow-Origin', allowOrigin);
|
|
|
195
|
+ res.setHeader('Access-Control-Allow-Credentials', 'true');
|
187
|
|
196
|
|
188
|
let params = Object.assign({}, req.query);
|
197
|
let params = Object.assign({}, req.query);
|
|
|
198
|
+ let uid = req.user.uid || 0;
|
|
|
199
|
+
|
|
|
200
|
+ if (uid) {
|
|
|
201
|
+ params.uid = uid;
|
|
|
202
|
+ }
|
189
|
|
203
|
|
190
|
params.isApp = req.yoho.isApp;
|
204
|
params.isApp = req.yoho.isApp;
|
191
|
params.limit = 24;
|
205
|
params.limit = 24;
|
|
|
206
|
+
|
192
|
searchModel.getSearchData(params).then((result) => {
|
207
|
searchModel.getSearchData(params).then((result) => {
|
193
|
|
208
|
|
194
|
if (result && result.list &&
|
209
|
if (result && result.list &&
|
195
|
- parseInt(params.page) === 1 && parseInt(params.start) > 0) {
|
210
|
+ parseInt(params.page, 10) === 1 && parseInt(params.start, 10) > 0) {
|
196
|
// 首屏渲染时,使用 'start' 参数裁减已渲染数据
|
211
|
// 首屏渲染时,使用 'start' 参数裁减已渲染数据
|
197
|
result.list = result.list.slice(params.start || 0);
|
212
|
result.list = result.list.slice(params.start || 0);
|
198
|
}
|
213
|
}
|