Merge remote-tracking branch 'origin/master' into release/wap-optim

# Conflicts:
#	package.json

@@ -285,7 +285,8 @@ const wechat = {
                 doPassportCallback(openId, nickname, 'wechat', req, res).catch(next);
                 doPassportCallback(openId, nickname, 'wechat', req, res).catch(next);
             })(req, res, next);
             })(req, res, next);
         } else {
         } else {
-            return next('Auth State Mismatch');
+            log.error('Auth State Mismatch:' + req.originalUrl);
+            return res.redirect(loginPage);
         }
         }
     }
     }
 };
 };
@@ -310,7 +311,8 @@ const sina = {
                 doPassportCallback(openId, nickname, 'sina', req, res).catch(next);
                 doPassportCallback(openId, nickname, 'sina', req, res).catch(next);
             })(req, res, next);
             })(req, res, next);
         } else {
         } else {
-            return next('Auth State Mismatch');
+            log.error('Auth State Mismatch:' + req.originalUrl);
+            return res.redirect(loginPage);
         }
         }
     }
     }
 };
 };
@@ -336,7 +338,8 @@ const qq = {
                 doPassportCallback(openId, nickname, 'qq', req, res).catch(next);
                 doPassportCallback(openId, nickname, 'qq', req, res).catch(next);
             })(req, res, next);
             })(req, res, next);
         } else {
         } else {
-            return next('Auth State Mismatch' + req.originalUrl);
+            log.error('Auth State Mismatch:' + req.originalUrl);
+            return res.redirect(loginPage);
         }
         }
     }
     }
 };
 };

@@ -106,7 +106,7 @@ const _searchGoods = (params) => {
         delete params.filter_poolId;
         delete params.filter_poolId;
     }
     }
 
 
-    if (params.shop_id) {
+    if (params.shop_id && !params.productPool) {
         method = 'app.search.li';
         method = 'app.search.li';
     } else if (params.brand) {
     } else if (params.brand) {
         method = 'app.search.brand';
         method = 'app.search.brand';

 {
 {
   "name": "m-yohobuy-node",
   "name": "m-yohobuy-node",
-  "version": "99.3.13",
+  "version": "5.3.15",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -65,6 +65,7 @@ $('.pitch').on('click', function() {
 });
 });
 
 
 function setPassword() {
 function setPassword() {
+    $btnSure.addClass('disable');
     return $.ajax({
     return $.ajax({
         type: 'POST',
         type: 'POST',
         url: '/passport/reg/setpassword',
         url: '/passport/reg/setpassword',
@@ -96,8 +97,12 @@ function setPassword() {
                     location.href = res.href;
                     location.href = res.href;
                 }, 1500);
                 }, 1500);
             } else {
             } else {
+                $btnSure.removeClass('disable');
                 showErrTip(data.message);
                 showErrTip(data.message);
             }
             }
+        },
+        error: function() {
+            $btnSure.removeClass('disable');
         }
         }
     });
     });
 }
 }
@@ -114,6 +119,7 @@ $btnSure.on('touchstart', function() {
     } else {
     } else {
         if ($('.pitch').hasClass('select')) {
         if ($('.pitch').hasClass('select')) {
             setPassword();
             setPassword();
+
         } else {
         } else {
             $('.prompt').show();
             $('.prompt').show();
 
 

@@ -1070,7 +1070,7 @@ $listNav.on('touchend touchcancel', function(e) {
         }
         }
         if (nav.reload) {
         if (nav.reload) {
             $(document).trigger('shouldSendBpData', [bpIdData]);
             $(document).trigger('shouldSendBpData', [bpIdData]);
-            search();
+            search({filtering: true});
         }
         }
     }
     }
 });
 });