merage searchOptimi

@@ -228,6 +228,7 @@ const search = (req, res, next) => {
             res.render('search/page', {
             res.render('search/page', {
                 layout: false,
                 layout: false,
                 new: result.list,
                 new: result.list,
+                suggestion: result.suggestion || [],
                 total: result.total,
                 total: result.total,
                 _noLazy: params.noLazy || false
                 _noLazy: params.noLazy || false
             });
             });

@@ -57,10 +57,10 @@
     {{> product/filter-tab}}
     {{> product/filter-tab}}
 
 
     <div id="goods-container" class="goods-container">
     <div id="goods-container" class="goods-container">
-        {{!--搜索推荐词模板--}}
-        {{> search/search-word-content}}
-
         <div class="default-goods container clearfix">
         <div class="default-goods container clearfix">
+            {{!--搜索推荐词模板--}}
+            {{> search/search-word-content}}
+
             {{#newGoods}}
             {{#newGoods}}
                 {{> common/goods}}
                 {{> common/goods}}
             {{/newGoods}}
             {{/newGoods}}

+{{!--搜索推荐词模板--}}
+{{> search/search-word-content}}
 <div class="total" data-id="{{total}}"></div>
 <div class="total" data-id="{{total}}"></div>
 {{# new}}
 {{# new}}
     {{> common/goods}}
     {{> common/goods}}

@@ -102,10 +102,10 @@
             <p class="intro-text">{{@root.introText}}</p>
             <p class="intro-text">{{@root.introText}}</p>
         {{/@root.introText}}
         {{/@root.introText}}
 
 
-        {{!--搜索推荐词模板--}}
-        {{> search/search-word-content}}
-
         <div class="firstscreen-goods container clearfix">
         <div class="firstscreen-goods container clearfix">
+            {{!--搜索推荐词模板--}}
+            {{> search/search-word-content}}
+
             {{#@root.firstPageGoods.list}}
             {{#@root.firstPageGoods.list}}
                 {{> common/goods}}
                 {{> common/goods}}
             {{/@root.firstPageGoods.list}}
             {{/@root.firstPageGoods.list}}

@@ -36,8 +36,7 @@ var $input = $('#search-input').find('input[name="query"]'),
     $buriedpoint = $('.buriedpoint'),
     $buriedpoint = $('.buriedpoint'),
     $search = $('#search');
     $search = $('#search');
 
 
-var shopId, sort, brand, outlets, app_type, age_level, msort, misort, coin, app_version, students, couponId;
-
+var shopId, sort, brand, outlets, app_type, age_level, msort, misort, coin, app_version, students, couponId, searchFrom;
 var size, color, style, standard, gender, price, p_d, query, limited, specialoffer, specialsale_id, promotion;
 var size, color, style, standard, gender, price, p_d, query, limited, specialoffer, specialsale_id, promotion;
 
 
 // 默认筛选条件
 // 默认筛选条件
@@ -248,6 +247,7 @@ specialsale_id = getQueryString('specialsale_id');
 promotion = getQueryString('promotion');
 promotion = getQueryString('promotion');
 students = getQueryString('students');
 students = getQueryString('students');
 couponId = getQueryString('coupon_id');
 couponId = getQueryString('coupon_id');
+searchFrom = getQueryString('from');
 
 
 if ($fsgc.children().length > 0) {
 if ($fsgc.children().length > 0) {
     var fsgcgoods = [],
     var fsgcgoods = [],
@@ -521,6 +521,10 @@ function search(opt) {
         params.coupon_id = couponId;
         params.coupon_id = couponId;
     }
     }
 
 
+    if (searchFrom) {
+        params.from = searchFrom;
+    }
+
     $.extend(setting, defaultOpt, params);
     $.extend(setting, defaultOpt, params);
     searching = true;
     searching = true;
     loading.showLoadingMask();
     loading.showLoadingMask();

@@ -39,7 +39,7 @@ var $input = $('#search-input').find('input[name="query"]'),
 
 
 var C_ID, filext = {}, total, argument;
 var C_ID, filext = {}, total, argument;
 
 
-var shopId, sort, brand, outlets, app_type, age_level, msort, misort, coin, app_version, first_load = true;
+var shopId, sort, brand, outlets, app_type, age_level, msort, misort, coin, app_version, first_load = true, searchFrom;
 
 
 // 默认筛选条件
 // 默认筛选条件
 var defaultOpt = require('common/query-param');
 var defaultOpt = require('common/query-param');
@@ -214,6 +214,7 @@ msort = getQueryString('msort');
 misort = getQueryString('misort');
 misort = getQueryString('misort');
 coin = getQueryString('coin');
 coin = getQueryString('coin');
 app_version = getQueryString('app_version') || getQueryString('appVersion');
 app_version = getQueryString('app_version') || getQueryString('appVersion');
+searchFrom = getQueryString('from');
 
 
 /**
 /**
  * 筛选注册的回调，筛选子项点击后逻辑
  * 筛选注册的回调，筛选子项点击后逻辑
@@ -372,6 +373,10 @@ function search(opt) {
         params.app_version = app_version;
         params.app_version = app_version;
     }
     }
 
 
+    if (searchFrom) {
+        params.from = searchFrom;
+    }
+
     $.extend(setting, defaultOpt, params);
     $.extend(setting, defaultOpt, params);
     searching = true;
     searching = true;
     if (setting.page >= 1) {
     if (setting.page >= 1) {

@@ -208,7 +208,7 @@ exports.termsSuggestion = (list, options) => {
     _.each(list, (terms, index) => {
     _.each(list, (terms, index) => {
         termsSuggestion.push({
         termsSuggestion.push({
             name: terms,
             name: terms,
-            link: helpers.urlFormat('/', {needSuggestion: 'Y', query: terms}, 'search'),
+            link: helpers.urlFormat('/', {needSuggestion: 'Y', query: terms, from: 'search'}, 'search'),
             select: (options.isChangedQuery && index === 0) ||
             select: (options.isChangedQuery && index === 0) ||
                 (options.needSuggestion === 'Y' && terms === decodeURIComponent(options.query))
                 (options.needSuggestion === 'Y' && terms === decodeURIComponent(options.query))
         });
         });