Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -55,7 +55,7 @@ module.exports = {
     /* 收藏店铺 */
     collectShop: (req, res, next) => {
         if (!req.user.uid) {
-            res.json({
+            return res.json({
                 code: 403,
                 message: '未登录'
             });

@@ -118,6 +118,6 @@ module.exports = {
                 method: 'app.favorite.add'
             });
         }
-        return api.get('', finalParams, {code: 200, cache: false});
+        return api.get('', finalParams);
     }
 };

@@ -32,7 +32,7 @@
                 // query
                 url: '/search.json',
                 order: '',
-                query: qs.query,
+                query: decodeURIComponent(qs.query),
                 page: 0, // 未搜索 page=0; 全部加载完 page = totalPage; 无数据: page !=0 && productList.length=0
                 totalPage: null,