Merge remote-tracking branch 'remotes/origin/master' into hotfix/security-2

@@ -28,6 +28,9 @@ const list = (req, res, next) => {
     if (params.shop_id) {
         params.shopId = params.shop_id;
     }
+
+    params.isApp = req.yoho.isApp;
+
     return searchModel.searchKeyActivity(params.query || '').then(activityResult => {
         let activity = _.get(activityResult, 'urlobj.appUrl', '');
 

@@ -474,6 +474,9 @@ function search(opt, filtering) {
 
     if (filtering) {
         $fsgc.addClass('hide');
+        if (params.start) {
+            delete setting.start;
+        }
     }
 
     $.ajax({
@@ -816,6 +819,8 @@ $newList.on('touchstart', 'li', function(e) {
         $firstLiDom = $listNav.find('li.first-li-more');
 
     e.preventDefault();
+
+
     if ($(this).hasClass('new')) {
         navType = 'new';
     } else if ($(this).hasClass('default')) {
@@ -832,6 +837,14 @@ $newList.on('touchstart', 'li', function(e) {
     $(document).trigger('shouldSendBpData', [bpIdData]);
     newListHide();
 
+    if (navType !== 'default') {
+        $fsgc.addClass('hide');
+    }
+
+    if ($(this).hasClass('active')) {
+        return;
+    }
+
     // 切换container显示
     $goodsContainer.children('.container:not(.hide)').addClass('hide');