merge master

@@ -124,9 +124,26 @@ const collectShop = (req, res, next) => {
     }
     }
 };
 };
 
 
+const isFavShop = (req, res, next) => {
+    let uid = req.user.uid;
+    let shopId = req.body.shopId;
+
+    if (!uid || !shopId) {
+        res.json({
+            code: 400,
+            message: '未收藏'
+        });
+    }
+
+    fav.getFavStatus(uid, shopId, 'shop').then(result => {
+        res.json(result);
+    }).catch(next);
+};
+
 module.exports = {
 module.exports = {
     changeFavoriteBrand,
     changeFavoriteBrand,
     collectProduct,
     collectProduct,
     collectShop,
     collectShop,
+    isFavShop,
     isFavoriteBrand
     isFavoriteBrand
 };
 };

@@ -107,3 +107,19 @@ exports.userAcquireStatus = (req, res, next) => {
     }).catch(next);
     }).catch(next);
 
 
 };
 };
+
+
+/**
+ * 学生返币专享页面
+ * @param  {[type]} req [description]
+ * @param  {[type]} res [description]
+ * @return {[type]}     [description]
+ */
+exports.list = (req, res, next) => {
+    let resData = {};
+
+    studentsModel.getStudentsList(req.query, req.yoho.channel).then(result => {
+        Object.assign(resData, result);
+        res.render('list/index', resData);
+    }).catch(next);
+};

@@ -56,8 +56,8 @@ const indexAsync = pid => {
                     marketPrice: cur.product.productPriceBo.formatMarketPrice,
                     marketPrice: cur.product.productPriceBo.formatMarketPrice,
                     productName: cur.product.productName,
                     productName: cur.product.productName,
                     href: helpers.getUrlBySkc(
                     href: helpers.getUrlBySkc(
-                        _.head(goods.goodsImagesList).productId,
-                        _.head(goods.goodsImagesList).goodsId,
+                        _.get(goods, 'goodsImagesList[0].productId', ''),
+                        _.get(goods, 'goodsImagesList[0].goodsId', ''),
                         cur.product.cnAlphabet
                         cur.product.cnAlphabet
                     )
                     )
                 };
                 };

@@ -1063,11 +1063,9 @@ const _detailDataPkg = (origin, uid, vipLevel, cookies) => {
 
 
         result.goCartUrl = helpers.urlFormat('/shopping/cart');
         result.goCartUrl = helpers.urlFormat('/shopping/cart');
 
 
-        let brandId = propOrigin('brand_info.brand_id', 0);
-
         let requestApi = {
         let requestApi = {
             addition: _getProductAdditionInfoAsync(origin), // 预处理所有的数据
             addition: _getProductAdditionInfoAsync(origin), // 预处理所有的数据
-            fav: _getProductFavoriteDataAsync(uid, result.productI), // 处理收藏喜欢数据
+            fav: _getProductFavoriteDataAsync(uid, result.productId), // 处理收藏喜欢数据
             promotion: productAPI.getPromotionAsync(result.skn) // 打折信息
             promotion: productAPI.getPromotionAsync(result.skn) // 打折信息
         };
         };
 
 

@@ -9,6 +9,23 @@
 const api = global.yoho.API;
 const api = global.yoho.API;
 
 
 /**
 /**
+ * 是否收藏API
+ * @function cancelFavAsync
+ * @param { number } uid 用户uid
+ * @param { number } id 收藏id
+ * @param { string } type 类型 product--商品 brand--品牌 shop--店铺
+ * @return { Object } 收藏状态
+ */
+const isFavAsync = (uid, id, type) => {
+    return api.get('', {
+        method: 'app.favorite.isFavorite',
+        id: id,
+        uid: uid,
+        type: type
+    });
+};
+
+/**
  * 收藏API
  * 收藏API
  * @function addFavAsync
  * @function addFavAsync
  * @param { number } uid 用户uid
  * @param { number } uid 用户uid
@@ -43,6 +60,7 @@ const cancelFavAsync = (uid, id, type) => {
 };
 };
 
 
 module.exports = {
 module.exports = {
+    isFavAsync, // 是否收藏
     addFavAsync, // 收藏
     addFavAsync, // 收藏
     cancelFavAsync // 取消收藏
     cancelFavAsync // 取消收藏
 };
 };

@@ -56,7 +56,12 @@ const toggleFavShop = (shopId, uid, isadd) => {
     }
     }
 };
 };
 
 
+const getFavStatus = (uid, id, type) => {
+    return favAPI.isFavAsync(uid, id, type);
+};
+
 module.exports = {
 module.exports = {
+    getFavStatus, // 收藏状态
     toggleFavProduct, // 收藏商品
     toggleFavProduct, // 收藏商品
     toggleFavBrand, // 收藏品牌
     toggleFavBrand, // 收藏品牌
     toggleFavShop // 收藏店铺
     toggleFavShop // 收藏店铺

@@ -902,6 +902,7 @@ const getBaseShopData = (params, extra, channel, shopId) => {
                 shopIntro: `/about?shopId=${shopId}`,
                 shopIntro: `/about?shopId=${shopId}`,
                 coled: _.get(result[2], 'data.is_favorite', 'N') === 'Y'
                 coled: _.get(result[2], 'data.is_favorite', 'N') === 'Y'
             });
             });
+
             _.set(resData, 'brand.shopBanner', decorator.shopTopBannerBase);
             _.set(resData, 'brand.shopBanner', decorator.shopTopBannerBase);
             _.unset(resData, 'brand.brandBanner');
             _.unset(resData, 'brand.brandBanner');
 
 
@@ -914,6 +915,7 @@ const getBaseShopData = (params, extra, channel, shopId) => {
         if (result[2].code === 200) {
         if (result[2].code === 200) {
             let shopName = _.get(result[2], 'data.shop_name', '');
             let shopName = _.get(result[2], 'data.shop_name', '');
 
 
+            _.set(resData, 'brand.shopBanner.shopName', shopName);
             _.set(resData, 'brand.pathNav[2]', {
             _.set(resData, 'brand.pathNav[2]', {
                 name: shopName,
                 name: shopName,
                 pathTitle: shopName
                 pathTitle: shopName

@@ -525,5 +525,7 @@ module.exports = {
     getShopDecorator,
     getShopDecorator,
     getArticleByBrand,
     getArticleByBrand,
     getShopList,
     getShopList,
-    getBrands4Filter
+    getBrands4Filter,
+    getProductListOrig,
+    getSearchCackeKey
 };
 };

@@ -72,7 +72,7 @@ const _signboard = data => {
     });
     });
 
 
     return {
     return {
-        title: result[0].title || '',
+        title: '',
         list: result
         list: result
     };
     };
 };
 };

@@ -6,6 +6,10 @@
 'use strict';
 'use strict';
 
 
 const api = global.yoho.API;
 const api = global.yoho.API;
+const config = require('../../../config/common');
+const searchApi = require('./search-api');
+const cache = global.yoho.cache;
+const logger = global.yoho.logger;
 
 
 /**
 /**
  * 获取完成认证学生总数
  * 获取完成认证学生总数
@@ -115,3 +119,58 @@ exports.userAcquireStatus = (uid, couponIds) => {
 
 
     return api.get('', finalParams);
     return api.get('', finalParams);
 };
 };
+
+
+/**
+ * 获取学生专享商品列表
+ * @return
+ */
+exports.getStudentsProduct = (params) => {
+    let finalParams = {
+        method: 'app.student.rebate',
+        sales: 'Y',
+        stocknumber: 1,
+        need_filter: 'yes',
+        limit: 60
+    };
+
+    Object.assign(finalParams, params);
+    if (!config.useCache) {
+        return searchApi.getProductListOrig(finalParams);
+    } else {
+        let cKey = searchApi.getSearchCackeKey(finalParams);
+
+        return cache.get(cKey).catch().then(cdata => {
+            let hasCache = false;
+
+            if (cdata) {
+
+                try {
+                    cdata = JSON.parse(cdata);
+                } catch (e) {
+                    logger.debug('getProductList cache data parse fail.');
+                }
+
+                if (cdata.filter && cdata.standard) {
+                    hasCache = true;
+                    finalParams.need_filter = 'no';
+                }
+            }
+
+            return searchApi.getProductListOrig(finalParams).then(result => {
+                if (hasCache && result && result.data) {
+                    Object.assign(result.data, cdata);
+                } else {
+                    if (result && result.data && result.data.filter) {
+                        cache.set(cKey, Object.assign({}, {
+                            filter: result.data.filter,
+                            standard: result.data.standard
+                        }), 3600);
+                    }
+                }
+
+                return result;
+            });
+        });
+    }
+};

@@ -115,7 +115,7 @@ exports.stuProducts = (data) => {
         data[key].market_price = data[key].sales_price;
         data[key].market_price = data[key].sales_price;
         delete data[key].sales_price;
         delete data[key].sales_price;
         if (value.student_price) {
         if (value.student_price) {
-            Object.assign(data[key], {forStu: true});
+            Object.assign(data[key], {for_stu: true});
         }
         }
     });
     });
     return products;
     return products;

@@ -5,7 +5,7 @@
  */
  */
 
 
 'use strict';
 'use strict';
-
+const utils = '../../../utils';
 const api = global.yoho.API;
 const api = global.yoho.API;
 const queryString = require('querystring');
 const queryString = require('querystring');
 const _ = require('lodash');
 const _ = require('lodash');
@@ -14,11 +14,13 @@ const studentsApi = require('./students-api');
 const stuHandler = require('./students-handler');
 const stuHandler = require('./students-handler');
 const helpers = global.yoho.helpers;
 const helpers = global.yoho.helpers;
 const crypto = global.yoho.crypto;
 const crypto = global.yoho.crypto;
-
-// const productProcess = require(`${utils}/product-process`);
-// const _ = require('lodash');
 const headerModel = require('../../../doraemon/models/header');
 const headerModel = require('../../../doraemon/models/header');
 const serviceApi = global.yoho.ServiceAPI;
 const serviceApi = global.yoho.ServiceAPI;
+const searchApi = require('./search-api');
+
+const productProcess = require(`${utils}/product-process`);
+const searchHandler = require('./search-handler');
+const needParams = ['query', 'msort', 'misort', 'gender', 'shelveTime'];
 
 
 // 学生营销资源码
 // 学生营销资源码
 const studentsCode = '989396a17443bf61e3e269702e51ef04'; // h5 a83b7d55324fb65f96c1f85a3387ebd8
 const studentsCode = '989396a17443bf61e3e269702e51ef04'; // h5 a83b7d55324fb65f96c1f85a3387ebd8
@@ -177,3 +179,86 @@ exports.userAcquireStatus = (uid, couponIds) => {
         return result;
         return result;
     });
     });
 };
 };
+
+/**
+ * 获取学生返币专享商品列表数据
+ */
+exports.getStudentsList = (params, channel) => {
+    let standard = [];
+
+    _.forEach(params, (value, key) => {
+        let s = _.split(key, 'parameter_', 2);
+
+        if (s.length > 1) {
+            standard.push(`${s[1]}_${value}`);
+            _.unset(params, `${key}`);
+        }
+    });
+
+    if (standard.length) {
+        params.standard = standard.join(',');
+    }
+
+    let searchParams = searchHandler.getSearchParams(params);
+
+    // 调用接口
+    let apiMethod = [
+        headerModel.requestHeaderData(channel),
+        searchApi.getSortList(Object.assign({}, {msort: '', misort: ''})),
+        studentsApi.getStudentsProduct(searchParams)
+    ];
+
+    return Promise.all(apiMethod).then(result => {
+        let finalResult = {
+            module: 'product',
+            page: 'list',
+            headerData: Object.assign(result[0].headerData, {
+                header: true
+            }),
+            list: {
+                leftContent: {}
+            }
+        };
+
+        // 获取左侧类目数据
+        if (result[1].code === 200) {
+            let dps = {};
+
+            _.forEach(needParams, (value) => {
+                if (params[value]) {
+                    dps[value] = params[value];
+                }
+            });
+
+            finalResult.list = Object.assign(
+            searchHandler.handlePathNavData(result[1].data.sort, params, 'sort', channel), {
+                leftContent: searchHandler.handleSortData(result[1].data.sort, dps)
+            });
+        }
+
+        // 获取商品数据和顶部筛选条件
+        if (result[2].code === 200) {
+            // 删掉student_price，不让页面显示
+            _.forEach(result[2].data.product_list, goods => {
+                delete goods.student_price;
+            });
+            Object.assign(finalResult.list, {
+                filters: searchHandler.handleFilterDataAll(result[2].data, params),
+                opts: searchHandler.handleOptsData(params, result[2].data.total, result[2].data.filter),
+                totalCount: result[2].data.total,
+                footPager: searchHandler.handlePagerData(result[2].data.total, params),
+                goods: productProcess.processProductList(result[2].data.product_list,
+                Object.assign({showDiscount: false}, params, {
+                    from: {type: 'list', params: params}
+                })),
+                hasNextPage: searchHandler.handleNextPage(params, result[2].data.total),
+
+                // 最近浏览记录
+                latestWalk: 6
+            });
+        }
+
+        finalResult.criteo = {skn: searchHandler.getCriteo(_.get(finalResult.list, 'goods'))};
+        return Object.assign({}, finalResult);
+    });
+};

@@ -85,6 +85,7 @@ router.get('/index/about', list.brandAbout);
 
 
 router.get('/shoplist', list.shopList); // 店铺列表页
 router.get('/shoplist', list.shopList); // 店铺列表页
 router.post('/shop/togglecollect', favorite.collectShop); // 店铺收藏
 router.post('/shop/togglecollect', favorite.collectShop); // 店铺收藏
+router.post('/index/isFavoriteShop', favorite.isFavShop); // 判断用户是否收藏品牌
 
 
 // 品牌页水牌
 // 品牌页水牌
 router.post('/index/getNodeContent', list.getNodeContent);
 router.post('/index/getNodeContent', list.getNodeContent);
@@ -102,5 +103,6 @@ router.get('/students/schoolList', students.schoolList); // 学校地区
 router.get('/students/eduLevel', students.eduLevel); // 学校地区
 router.get('/students/eduLevel', students.eduLevel); // 学校地区
 router.get('/students/verify', students.verify); // 身份验证
 router.get('/students/verify', students.verify); // 身份验证
 router.get('/students/userAcquireStatus', students.userAcquireStatus); // 获取优惠券领取状态
 router.get('/students/userAcquireStatus', students.userAcquireStatus); // 获取优惠券领取状态
+router.get('/students/list', students.list); // 获取优惠券领取状态
 
 
 module.exports = router;
 module.exports = router;

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

@@ -72,3 +72,22 @@ if ($brandFavor && $brandFavor.length) {
         }
         }
     });
     });
 }
 }
+
+// 页面进入更新收藏状态
+if ($shopFavor && $shopFavor.length) {
+    $.ajax({
+        type: 'POST',
+        url: '/product/index/isFavoriteShop',
+        data: {
+            shopId: shopId
+        }
+    }).then(function(data) {
+        if (data.code === 200 && data.data) {
+            // 已收藏
+            $shopFavor.find('i').addClass('coled');
+            return;
+        }
+
+        $shopFavor.find('i').removeClass('coled');
+    });
+}

@@ -11,12 +11,16 @@ var product = require('./index/product');
 
 
 var $shopIntro = $('.shop-intro'),
 var $shopIntro = $('.shop-intro'),
     $shopCollect = $('.shop-collect'),
     $shopCollect = $('.shop-collect'),
+    $colloectIcon = $shopCollect.find('.shop-collect-ico'),
+    $colloectText = $shopCollect.find('.shop-collect-text'),
     $searchForm = $('#shop-search-form'),
     $searchForm = $('#shop-search-form'),
     $sliderLeft = $('.slider-left'),
     $sliderLeft = $('.slider-left'),
     $allGoods = $('.all-goods'),
     $allGoods = $('.all-goods'),
     $fixedArea = $allGoods.find('.fixed-area'),
     $fixedArea = $allGoods.find('.fixed-area'),
     fixedAreaTop = $fixedArea.offset() ? $fixedArea.offset().top : 0;
     fixedAreaTop = $fixedArea.offset() ? $fixedArea.offset().top : 0;
 
 
+var shopId = $shopCollect.data('id');
+
 // Pjax
 // Pjax
 require('yoho-jquery-pjax');
 require('yoho-jquery-pjax');
 
 
@@ -36,6 +40,26 @@ if ($sliderLeft.length) {
     $sliderLeft.slider();
     $sliderLeft.slider();
 }
 }
 
 
+if ($shopCollect && $shopCollect.length) {
+    $.ajax({
+        type: 'POST',
+        url: '/product/index/isFavoriteShop',
+        data: {
+            shopId: shopId
+        }
+    }).then(function(data) {
+        if (data.code === 200 && data.data) {
+            // 已收藏
+            $colloectIcon.addClass('on');
+            $colloectText.html('已收藏');
+            return;
+        }
+
+        $colloectIcon.removeClass('on');
+        $colloectText.html('收藏');
+    });
+}
+
 $shopIntro.on('click', function() {
 $shopIntro.on('click', function() {
     $('.pop-shop-intro').show();
     $('.pop-shop-intro').show();
     $('.mask').show();
     $('.mask').show();
@@ -53,9 +77,7 @@ $('.shop-query-submit').on('click', function() {
 
 
 // 收藏店铺
 // 收藏店铺
 function colloectAction() {
 function colloectAction() {
-    var $colloectIcon = $shopCollect.find('.shop-collect-ico'),
-        $colloectText = $shopCollect.find('.shop-collect-text'),
-        isFavorite = $colloectIcon.hasClass('on'),
+    var isFavorite = $colloectIcon.hasClass('on'),
         needColloect = window.cookie('needColloect');
         needColloect = window.cookie('needColloect');
 
 
     $.ajax({
     $.ajax({
@@ -64,7 +86,7 @@ function colloectAction() {
         data: {
         data: {
             isFavorite: isFavorite ? 0 : 1,
             isFavorite: isFavorite ? 0 : 1,
             needColloect: needColloect,
             needColloect: needColloect,
-            shopId: $shopCollect.data('id')
+            shopId: shopId
         },
         },
         success: function(res) {
         success: function(res) {
             if (res.code === 200) {
             if (res.code === 200) {

@@ -448,7 +448,7 @@ $couponDia.on('click', function() {
 $rightDia.on('click', function() {
 $rightDia.on('click', function() {
     var cont = '<h3 class="dia-title">特权详细说明</h3>' +
     var cont = '<h3 class="dia-title">特权详细说明</h3>' +
     '<p>权益1：新品立享9折</p>' +
     '<p>权益1：新品立享9折</p>' +
-    '<p>学生购买原价新品时，可立即享受9折优惠，与VIP折扣不可同时享受。</p><br>' +
+    '<p>学生购买指定原价新品时，可立即享受9折优惠，与VIP折扣不可同时享受。</p><br>' +
     '<p>权益2：每1元返1个有货币</p>' +
     '<p>权益2：每1元返1个有货币</p>' +
     '<p>学生购买指定商品时，以商品的实际成交金额计算，每1元返1个有货币；</p>' +
     '<p>学生购买指定商品时，以商品的实际成交金额计算，每1元返1个有货币；</p>' +
     '<p>返有货币时间：确认收货7日后，系统将自动将对应数量的有货币返至购买账户；</p>' +
     '<p>返有货币时间：确认收货7日后，系统将自动将对应数量的有货币返至购买账户；</p>' +
@@ -662,7 +662,7 @@ $(function() {
 
 
     var rightsFirst = '<div class="item-content hide">' +
     var rightsFirst = '<div class="item-content hide">' +
         '<p class="item-title">新品立享9折</p>' +
         '<p class="item-title">新品立享9折</p>' +
-        '<p>学生购买原价新品时，可立即享受9折优惠，与VIP折扣不可同时享受。</p></div>';
+        '<p>学生购买指定原价新品时，可立即享受9折优惠，与VIP折扣不可同时享受。</p></div>';
 
 
     var rightsSecond = '<div class="item-content hide">' +
     var rightsSecond = '<div class="item-content hide">' +
         '<p class="item-title">每1元返1个有货币</p>' +
         '<p class="item-title">每1元返1个有货币</p>' +
@@ -825,9 +825,11 @@ $(function() {
         '#stuRights .stu-rights-item:eq(2), #stuRights .stu-rights-item:eq(3)').hover(function() {
         '#stuRights .stu-rights-item:eq(2), #stuRights .stu-rights-item:eq(3)').hover(function() {
             var content = $(this).find('.item-content');
             var content = $(this).find('.item-content');
 
 
+            var gapHeight;
+
             content.removeClass('hide');
             content.removeClass('hide');
 
 
-            let gapHeight = parseInt(content.height(), 10) + 40 - parseInt($(this).height(), 10);
+            gapHeight = parseInt(content.height(), 10) + 40 - parseInt($(this).height(), 10);
 
 
             if (gapHeight > 0) {
             if (gapHeight > 0) {
                 content.css('margin-top', -(gapHeight) + 'px');
                 content.css('margin-top', -(gapHeight) + 'px');

@@ -57,6 +57,13 @@
         width: 1150px;
         width: 1150px;
         margin: 0 auto;
         margin: 0 auto;
 
 
+        .shop-name {
+            margin-left: 60px;
+            font-size: 32px;
+            float: left;
+            border: none;
+        }
+
         .shop-favor {
         .shop-favor {
             margin-right: 60px;
             margin-right: 60px;
         }
         }

@@ -116,9 +116,10 @@
         .stu-rights-item .item-content {
         .stu-rights-item .item-content {
             position: absolute;
             position: absolute;
             top: 0;
             top: 0;
+            min-height: 160px;
             padding: 20px;
             padding: 20px;
             margin-top: 0;
             margin-top: 0;
-            transition: margin-top 2s linear;
+            transition: margin-top 2.5s linear;
             background: rgba(255,255,255,.95);
             background: rgba(255,255,255,.95);
         }
         }