Merge branch 'feature/shoprefactoring' into release/newSearch

@@ -12,7 +12,7 @@ const _ = require('lodash');
 const helpers = global.yoho.helpers;
 
 /**
- * 店铺基础模板
+ * 店铺 - 基础模板
  */
 const _baseShop = (req, res, shopInfo) => {
 
@@ -34,7 +34,7 @@ const _baseShop = (req, res, shopInfo) => {
 };
 
 /**
- * 店铺首页 || 若店铺使用基础模板就使用基础模板
+ * 店铺首页
  * @return int
  */
 const _shop = (req, res, shopId) => {
@@ -68,7 +68,7 @@ const _shop = (req, res, shopId) => {
     listModel.getShopData(req, shopId, uid, isApp).then(result => {
         if (result.goBrand) {
 
-            // 跳转基础模板
+            /* 若店铺使用基础模板跳转基础模板 */
             _baseShop(req, res, result.goBrand);
         } else {
             result = _.assign(result, pageHeader);
@@ -101,7 +101,12 @@ const category = (req, res) => {
     });
 };
 
-// 品牌|店铺落地页
+/**
+ * 品牌店铺的入口
+ * @param req
+ * @param res
+ * @param next
+ */
 const brand = (req, res, next) => {
     let params = Object.assign({}, req.query);
     let domain = req.query.domain;
@@ -179,7 +184,12 @@ const brand = (req, res, next) => {
     }).catch(next);
 };
 
-// 店铺简介
+/**
+ * 店铺简介
+ * @param req
+ * @param res
+ * @param next
+ */
 const shopIntro = (req, res, next) => {
     let shopId = req.query.shop_id;
     let appVersion = req.body.appVersion || false;

@@ -455,15 +455,13 @@ const getShopData = (req, shopId, uid, isApp) => {
             _getShopDecorator(shopId),
             searchModel.getFilterData({
                 shop_id: shopId,
-                gender: '1,3', // TODO TAR 获取性别
-                channel: channel,
-                brand: '' // TODO TAR 获取品牌
+                gender: req.query.gender || '1,3',
+                channel: channel
             }),
             searchModel.getSearchData({
                 shop_id: shopId,
-                gender: '1,3', // TODO TAR 获取性别
-                channel: channel,
-                brand: '' // TODO TAR 获取品牌
+                gender: req.query.gender || '1,3',
+                channel: channel
             })
         ]).then((result) => {
             shopData = {
@@ -479,7 +477,7 @@ const getShopData = (req, shopId, uid, isApp) => {
 
                 // noinspection JSCheckFunctionSignatures
                 return Object.assign(_formShopData(shopData, shopId, isApp),
-                    {filter: result[1]}, {goods: result[2]}); // TODO TAR 获取筛选数据和商品数据数据校验
+                    {filter: result[1]}, {goods: result[2]});
             });
         });
 

@@ -187,7 +187,7 @@ gulp.task('webpack-dev-server', () => {
 
     new WebpackDevServer(webpack(devConfig), {
         contentBase: '.',
-        publicPath: '//localhost:5001/',
+        publicPath: 'http://localhost:5001/',
         hot: true,
         stats: {
             colors: true

@@ -278,8 +278,8 @@ function search(opt) {
         params.shop_id = shopId;
     }
 
-    if (ageLevel) {
-        params.age_level = ageLevel;
+    if (age_level) {
+        params.age_level = age_level;
     }
 
     if (sort) {
@@ -385,7 +385,7 @@ function search(opt) {
 
 }
 
-// require('../../common/suspend-cart'); //悬浮购物车
+require('../../common/suspend-cart'); // 悬浮购物车
 /* tar add 160914 */
 if ($brandHeader.data('isbaseshop') === 1) {
     Object.assign(defaultOpt, {shop_id: $brandHeader.data('id')});

@@ -914,14 +914,14 @@ $collect.on('touchstart', function() {
             if (data.code === 200) {
                 if ($collect.hasClass('already-collect')) {
                     $collect.attr('class', 'not-collect');
+                    tip.show('店铺取消收藏成功');
                 } else {
                     $collect.attr('class', 'already-collect');
+                    tip.show('店铺收藏成功');
                 }
             }
 
             if (data.code === 401) {
-                // url = 'http://m.yohobuy.com/signin.html?refer=' + encodeURIComponent(location.href) + '&openby:yohobuy=';
-                // url += JSON.stringify({"action": "go.weblogin", "params": { "jumpurl": { "url": 'http://m.yohobuy.com' + location.pathname, "param": info.data }, "requesturl": { "param": {}, "url": "" }, "priority": "N" } });
                 url = data.url;
                 if ($('#jump-login').length <= 0) {
                     $('body').append('<a href=\'' + url + '\'><span id="jump-login"><span></a>');