Merge remote-tracking branch 'remotes/origin/master' into feature/guang

刘传洋
Commit c8a3ac9d8ad8c4f8b02aa4d3f7a56990b1a6c031 2 parents e178c846 1a527a97
Showing 14 changed files with 105 additions and 54 deletions
apps/channel/controllers/index.js
apps/product/controllers/list.js
apps/product/controllers/sale.js
apps/product/models/detail-service.js
apps/product/models/list.js
apps/product/models/sale-api.js
apps/product/models/sale.js
apps/product/models/search-handler.js
apps/product/models/search.js
doraemon/views/partial/product/good.hbs
package.json
public/scss/product/_filter-box.css
utils/pager.js
utils/product-process.js
--- a/apps/channel/controllers/index.js
View file @c8a3ac9
+++ b/apps/channel/controllers/index.js
View file @c8a3ac9
@@ -33,7 +33,7 @@ exports.getNewArrival = (req, res, next) => {
     let reqBody = req.body,
         pageIndex = reqBody.pageIndex,
         pageCount = reqBody.pageCount,
-        channel = reqBody.type,
+        channel = reqBody.type || req.yoho.channel,
         goods = [],
         result = {};
--- a/apps/product/controllers/list.js
View file @c8a3ac9
+++ b/apps/product/controllers/list.js
View file @c8a3ac9
@@ -15,7 +15,7 @@ const searchApi = require(`${mRoot}/search-api`);
 const shop = (shopId, req, res, next, brandInfo) => {
     shopId = parseInt(shopId, 10);
-    list.getShopInfo(shopId, req.user.id).then(shopInfo => {
+    list.getShopInfo(shopId, req.user.uid).then(shopInfo => {
         if (+shopInfo.shopTemplateType === 2) { // 经典模板
             let pjax = req.query._pjax;
@@ -158,7 +158,7 @@ exports.shopList = (req, res, next) => {
         return next();
     }
-    list.getShopListData(req.yoho.channel, req.query).then(result => {
+    list.getShopListData(req.yoho.channel, req.query, req.user.uid).then(result => {
         Object.assign(result, {
             page: 'shop',
             shopId: shopId
--- a/apps/product/controllers/sale.js
View file @c8a3ac9
+++ b/apps/product/controllers/sale.js
View file @c8a3ac9
@@ -16,7 +16,7 @@ const sale = require(`${mRoot}/sale`); // sale 页 model
  * @return {[type]}     [description]
  */
 exports.index = (req, res, next) => {
-    let channel = req.query.channel || req.cookies._Channel || 'boys';
+    let channel = req.query.channel || req.yoho.channel;
     // 真实数据输出
     sale.getSaleIndexData(channel).then(result => {
@@ -41,7 +41,7 @@ exports.discount = (req, res, next) => {
         saleType: '3'
     }, req.query);
-    let channel = req.query.channel || req.cookies._Channel || 'boys';
+    let channel = req.query.channel || req.yoho.channel;
     let responseData = {
         module: 'product',
@@ -68,7 +68,7 @@ exports.vip = (req, res, next) => {
         saleType: '2'
     }, req.query);
-    let channel = req.query.channel || req.cookies._Channel || 'boys';
+    let channel = req.query.channel || req.yoho.channel;
     params.uid = req.user.uid || 0;
@@ -95,7 +95,7 @@ exports.newSale = (req, res, next) => {
         order: 's_t_desc'
     }, req.query);
-    let channel = req.query.channel || req.cookies._Channel || 'boys';
+    let channel = req.query.channel || req.yoho.channel;
     sale.getSaleOthersData(params, channel).then((result) => {
         res.render('sale/other', Object.assign({
@@ -119,7 +119,7 @@ exports.breakingYards = (req, res, next) => {
         saleType: '5'
     }, req.query);
-    let channel = req.query.channel || req.cookies._Channel || 'boys';
+    let channel = req.query.channel || req.yoho.channel;
     let responseData = {
         module: 'product',
--- a/apps/product/models/detail-service.js
View file @c8a3ac9
+++ b/apps/product/models/detail-service.js
View file @c8a3ac9
@@ -373,7 +373,7 @@ const _getFashionTopGoodsStatus = (uid, showStatus, isBeginSale) => {
     // dis //失效
     // buyNow  //是否立即购买
     let result = {
-        getLimitedCode: true,
+        getLimitedCode: false,
         hadLimitedCode: false,
         limitedCodeSoldOut: false,
         openSoon: false,
@@ -393,17 +393,16 @@ const _getFashionTopGoodsStatus = (uid, showStatus, isBeginSale) => {
                 result.openSoon = true;
                 result.hadLimitedCode = false;
             }
+            result.getLimitedCode = true;
             break;
         case 2: // 开售后，限购码已抢光（用户未领取限购码）
             result.buyNow = true;
             result.dis = true;
             result.limitedCodeSoldOut = true;
-            result.getLimitedCode = false;
             result.hadLimitedCode = false;
             break;
         case 3: // 开售后，商品已经售罄
             result.soldOut = true;
-            result.getLimitedCode = false;
             break;
         case 4:// 开售后，立即购买（用户已领取限购码）
             result.buyNow = true;
@@ -417,7 +416,6 @@ const _getFashionTopGoodsStatus = (uid, showStatus, isBeginSale) => {
             result.openSoon = true;
             result.hadLimitedCode = true;
             result.limitedCodeSoldOut = true;
-            result.getLimitedCode = false;
             break;
         case 6: // 开售前，即将开售（用户已领取限购码）
             result.openSoon = true;
@@ -1102,21 +1100,22 @@ const _detailDataPkg = (origin, uid, vipLevel) => {
             result.vipPrice = _getVipDataByProductBaseInfo(origin, vipLevel, uid);
         }
-        //  促销活动banner,虚拟商品无促销
+        // 促销活动banner,虚拟商品无促销
         if (propOrigin('attribute') !== 3) {
             result.activity = _getActivityDataByProductBaseInfo(promotionData, additionalData);
         }
-        const C_VALUE = {
-            type: '返有货币',
-            des: '每件返 ',
-            rest: '个 有货币'
-        };
+        // 有货币
+        if (!_.includes(['', '0'], propOrigin('yohoCoinNum'))) {
+            const C_VALUE = {
+                type: '返有货币',
+                des: '每件返 ',
+                rest: '个 有货币'
+            };
-        if (propOrigin('yoho_coin_num', '0') !== '0') {
             result.activity.push({
                 type: C_VALUE.type,
-                des: `${C_VALUE.des}${propOrigin('yoho_coin_num')}${C_VALUE.rest}`
+                des: `${C_VALUE.des}${propOrigin('yohoCoinNum')}${C_VALUE.rest}`
             });
         }
@@ -1152,12 +1151,12 @@ const _detailDataPkg = (origin, uid, vipLevel) => {
         // 是否收藏
         result.isCollect = favoriteData.product;
-        if (propOrigin('is_limit_buy', false)) {
+        if (propOrigin('isLimitBuy', false)) {
             // 是否开售
-            let isBeginSale = propOrigin('sale_status', 0) === 1;
+            let isBeginSale = propOrigin('saleStatus', 0) === 1;
             // 限购商品有关的展示状态
-            let showStatus = propOrigin('show_status', 1);
+            let showStatus = propOrigin('showStatus', 1);
             let fashTopGoods = _getFashionTopGoodsStatus(uid, showStatus, isBeginSale);
@@ -1237,8 +1236,13 @@ const _detailDataPkg = (origin, uid, vipLevel) => {
         statGoodsInfo.productId = propOrigin('product_id');
         statGoodsInfo.productName = result.name.replace('\'', '’');
         statGoodsInfo.brandName = (result.brandName || '').replace('\'', '’');
-        statGoodsInfo.marketPrice = result.marketPrice;
-        statGoodsInfo.salePrice = result.salePrice ? result.salePrice : result.marketPrice;
+        statGoodsInfo.marketPrice = result.marketPrice.replace('¥', ''); // 数字
+        statGoodsInfo.salePrice = (result.salePrice ? result.salePrice : result.marketPrice).replace('¥', ''); // 数字
+        statGoodsInfo.imageUrl = 'http:' + result.img.split('?')[0];
+        statGoodsInfo.productUrl = 'http:' +
+            helpers.urlFormat(url.parse(propOrigin('product_url')).pathname, null, 'item');
+        statGoodsInfo.smallSortId = result.smallSortId;
+        statGoodsInfo.soldOut = soldOut ? 1 : 0;
         if (banner.brandId) {
             let domainBrand = yield brandService.getBrandByDomainAsync(banner.brandDomain);
@@ -1258,11 +1262,6 @@ const _detailDataPkg = (origin, uid, vipLevel) => {
             }
         }
-        statGoodsInfo.imageUrl = 'http:' + result.img.split('?')[0];
-        statGoodsInfo.productUrl = 'http:' +
-            helpers.urlFormat(url.parse(propOrigin('product_url')).pathname, null, 'item');
-        statGoodsInfo.smallSortId = result.smallSortId;
-        statGoodsInfo.soldOut = soldOut ? 1 : 0;
         // 获取商品尺寸相关
         let sizeInfo = _getSizeInfo(result, result.maxSortId, additionalData);
--- a/apps/product/models/list.js
View file @c8a3ac9
+++ b/apps/product/models/list.js
View file @c8a3ac9
@@ -118,7 +118,9 @@ const getListData = (params, channel) => {
                 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)),
+                    Object.assign({showDiscount: false}, params, {
+                        from: {type: 'list', params: params}
+                    })),
                 hasNextPage: searchHandler.handleNextPage(params, result[2].data.total),
                 // 最近浏览记录
@@ -194,7 +196,8 @@ const getListNewData = (params, channel) => {
                 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, showNew: false}, params)),
+                    Object.assign({showDiscount: false, showNew: false,
+                        from: {type: 'listNew', params: params}}, params)),
                 hasNextPage: searchHandler.handleNextPage(params, result[2].data.total),
                 // 最近浏览记录
@@ -265,7 +268,7 @@ const getBrandData = (params, extra, channel) => {
     let apiMethod = [
         headerModel.requestHeaderData(channel),
         searchApi.getSortList(queryBase),
-        searchApi.getProductList(Object.assign({order: order}, searchParams, queryBase))
+        searchApi.getProductList(Object.assign(searchParams, {order: order}, queryBase))
     ];
@@ -304,16 +307,16 @@ const getBrandData = (params, extra, channel) => {
                 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)),
+                    Object.assign({showDiscount: false, from: {type: 'brand', params: params}}, params)),
                 hasNextPage: searchHandler.handleNextPage(params, result[2].data.total),
                 // 最近浏览记录
                 latestWalk: 7
             });
-        }
-        // 品牌页不显示品牌筛选项
-        delete finalResult.brand.filters.brand;
+            // 品牌页不显示品牌筛选项
+            _.unset(finalResult, 'brand.filters.brand');
+        }
         finalResult.criteo = {skn: searchHandler.getCriteo(_.get(finalResult.brand, 'goods'))};
@@ -417,7 +420,7 @@ const getShopAbout = (shopId, uid, channel) => {
         if (result[1].code === 200) {
             let data = result[1].data || {},
-                decorator = shopHandler.getShopDecorator(data, {}, shopId);
+                decorator = shopHandler.getShopDecorator(data, {}, shopId, true);
             Object.assign(decorator.shopTopBannerBase, {
                 shopId: shopId,
@@ -637,7 +640,8 @@ const getShopData = (shopId, channel, params, shopInfo) => {
                 finalResult.leftContent = searchHandler.handleSortData(groupSort, params);
                 if (finalResult.allGoods) {
-                    Object.assign(finalResult.allGoods, searchHandler.setShopSort(groupSort, params));
+                    Object.assign(finalResult.allGoods, searchHandler.setShopSort(groupSort, Object.assign({},
+                        params, {page: 1})));
                 }
             }
@@ -652,7 +656,7 @@ const getShopData = (shopId, channel, params, shopInfo) => {
                 for (let i = 0; i < 3; i++) {
                     trendList.push({
-                        href: articleList[i].url,
+                        href: helpers.urlFormat(`/${articleList[i].id}.html`, '', 'guang'),
                         src: helpers.getForceSourceUrl(articleList[i].src) +
                             '?imageView/1/w/{width}/h/{height}',
                         mainTitle: articleList[i].title,
@@ -712,7 +716,8 @@ const getShopGoodsData = (shopId, channel, params) => {
             if (subRes.code === 200) {
                 let groupSort = _.get(subRes, 'data.sort', []);
-                Object.assign(resData, searchHandler.setShopSort(groupSort, params));
+                Object.assign(resData, searchHandler.setShopSort(groupSort, Object.assign(params,
+                    {page: 1})));
             }
             return resData;
@@ -794,6 +799,9 @@ const getShopListData = (channel, params, uid) => {
                     }),
                     footPager: {tip: tip}
                 });
+
+                _.set(finalResult, 'filters.checkedConditions.clearUrl',
+                    `?navBar=${params.navBar}&shopId=${params.shopId}`);
             } else {
                 finalResult.searchEmpty = true;
@@ -886,6 +894,11 @@ const getBaseShopData = (params, extra, channel, shopId) => {
             });
         }
+        // 临时删除seo信息
+        _.unset(resData, 'title');
+        _.unset(resData, 'keywords');
+        _.unset(resData, 'description');
+
         return resData;
     });
 };
--- a/apps/product/models/sale-api.js
View file @c8a3ac9
+++ b/apps/product/models/sale-api.js
View file @c8a3ac9
@@ -63,14 +63,14 @@ exports.getSalebreakingYardsSortList = (params) => {
  * @return {[type]} [description]
  */
 exports.getSaleActivityList = (params, channel) => {
-    let tempChannel = _.isEmpty(channel) ? 'boys' : channel;
+    let tempChannel = yhChannel[channel] || yhChannel.boys;
     return api.get('', {
         id: params.id || null,
         method: 'app.activity.get',
         sort: '2',
         plateform: '1',
-        yh_channel: yhChannel[tempChannel].channel
+        yh_channel: tempChannel.channel
     });
 };
--- a/apps/product/models/sale.js
View file @c8a3ac9
+++ b/apps/product/models/sale.js
View file @c8a3ac9
@@ -529,7 +529,7 @@ exports.getSaleSpecialData = (id, params, channel) => {
                     limit: limit,
                     attribute_not: 2
                 });
-            let banner = JSON.parse(data.banner_img) || [];
+            let banner = data.banner_img ? JSON.parse(data.banner_img) : [];
             Object.assign(resData, {
                 mainBanner: {
@@ -581,7 +581,8 @@ exports.getSaleSpecialData = (id, params, channel) => {
                 Object.assign(resData, {
                     filters: searchHandler.handleFilterDataAll(_.get(result[2], 'data', {}), params),
                     opts: searchHandler.handleOptsData(params, tip.total),
-                    goods: productProcess.processProductList(_.get(result[2], 'data.product_list', [])),
+                    goods: productProcess.processProductList(_.get(result[2], 'data.product_list', []),
+                        {from: {type: 'saleSpecial', params: params}}),
                     footPager: {tip: tip}
                 });
--- a/apps/product/models/search-handler.js
View file @c8a3ac9
+++ b/apps/product/models/search-handler.js
View file @c8a3ac9
@@ -311,7 +311,7 @@ exports.handleOptsData = (params, total, extra) => {
         switch (i) {
             case 0:
-                opt.href = handleFilterUrl(params, {order: ''}, {page: true});
+                opt.href = handleFilterUrl(params, {}, {page: true, order: true});
                 if (extra === 'discont') { // 如果是折扣专场
                     opt.name = '全部';
                     if (_.isEmpty(params.order) || params.order === 's_t_desc') {
@@ -582,6 +582,9 @@ exports.handleFilterData = (origin, params, total) => {
             if (params.price === key) {
                 priceRangechecked = true;
             }
+            if (_.isString(value)) {
+                value = _.replace(value, '￥', '¥');
+            }
             let price = {
                 checked: params.price === key,
                 href: handleFilterUrl(params, {price: key}),
--- a/apps/product/models/search.js
View file @c8a3ac9
+++ b/apps/product/models/search.js
View file @c8a3ac9
@@ -68,7 +68,7 @@ exports.getSearchData = (params, channel) => {
                     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)),
+                        Object.assign({showDiscount: false, from: {type: 'search', params: params}}, params)),
                     latestWalk: 6,
                     hasNextPage: searchHandler.handleNextPage(params, result[2].data.total),
                     shopEntry: result[3]
--- a/doraemon/views/partial/product/good.hbs
View file @c8a3ac9
+++ b/doraemon/views/partial/product/good.hbs
View file @c8a3ac9
@@ -78,7 +78,7 @@
         </p>
         <div class="hideList hide">
             {{#goods_list}}
-                <li data-src="{{image images_url 280 374}}" data-url="{{../url}}" data-status="{{status}}"></li>
+                <li data-src="{{image images_url 280 382}}" data-url="{{../url}}" data-status="{{status}}"></li>
             {{/goods_list}}
         </div>
     </div>
--- a/package.json
View file @c8a3ac9
+++ b/package.json
View file @c8a3ac9
 {
   "name": "yohobuy-node",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {
--- a/public/scss/product/_filter-box.css
View file @c8a3ac9
+++ b/public/scss/product/_filter-box.css
View file @c8a3ac9
@@ -300,6 +300,7 @@
     .ud-price-range {
         margin-top: 2px;
+        display: inline-block;
     }
     .limit {
--- a/utils/pager.js
View file @c8a3ac9
+++ b/utils/pager.js
View file @c8a3ac9
@@ -64,7 +64,7 @@ exports.setPager = (total, params)=>{
         for (i = 1; i <= len; i++) {
             let p = currentPage + i + 2;
-            if (i > total) {
+            if (p > total) {
                 break;
             }
@@ -78,7 +78,7 @@ exports.setPager = (total, params)=>{
         for (i = 1; i <= len; i++) {
             let p = currentPage - i - 2;
-            if (i < 1) {
+            if (p < 1) {
                 break;
             }
--- a/utils/product-process.js
View file @c8a3ac9
+++ b/utils/product-process.js
View file @c8a3ac9
@@ -7,6 +7,15 @@ const helpers = global.yoho.helpers;
 // const images = require(`${global.utils}/images`);
+const itemFromBase = {
+    search: {domain: 'search', module: 's'}, // 搜索页search.yohobuy.com
+    list: {domain: 'list', module: 'c'}, // list.yohobuy.com
+    listSale: {domain: 'list', module: 's'}, // list.yohobuy.com/sale
+    listNew: {domain: 'list', module: 'n'}, // list.yohobuy.com/new
+    brand: {domain: 'brand', module: 'b'}, // xxx.yohobuy.com[品牌域名]
+    saleSpecial: {domain: 'sale', module: 's'}// sale.yohobuy.com
+};
+
 // NOTE: 这里修改了图片质量的参数
 helpers.image = _.flow(helpers.image, fp.replace(/\/quality\/\d*$/, '/quality/90'));
@@ -105,6 +114,8 @@ const procProductImgs = (item, gender) => {
  */
 exports.processProductList = (list, options) => {
     const pruductList = [];
+    let itemNum = 0,
+        itemFrom;
     options = Object.assign({
         showTags: true,
@@ -118,11 +129,30 @@ exports.processProductList = (list, options) => {
         height: 388,
         isApp: false,
         showPoint: true,
-        gender: '2,3'
+        gender: '2,3',
+        from: {} // 来源
     }, options);
-    _.forEach(list, (product) => {
+    // 处理item from
+    if (!_.isEmpty(options.from) && itemFromBase[options.from.type]) {
+        let f = {domain: '', module: '', key: ''};
+        let params = options.from.params || {};
+
+        f.page = params.page || 1;
+
+        Object.assign(f, itemFromBase[options.from.type], {
+            page: params.page || 1,
+            key: params.misort || params.msort || ''
+        });
+        if (options.from.type === 'search') {
+            f.key = params.query || '';
+        }
+
+        itemFrom = `from=${f.domain}-${f.module}-${f.key}_${f.page}_`;
+    }
+
+    _.forEach(list, (product) => {
         // 商品信息有问题，则不显示
         if (!product || !product.product_skn || !product.goods_list.length) {
@@ -166,7 +196,7 @@ exports.processProductList = (list, options) => {
         });
         product.is_few = product.is_soon_sold_out === 'Y';
-        product.url = helpers.urlFormat(`/product/pro_${product.product_id}_${product.goods_list[0].goods_id}/${product.cn_alphabet}.html`); // eslint-disable-line
+        product.url = helpers.urlFormat(`/product/pro_${product.product_id}_${product.goods_list[0].goods_id}/${product.cn_alphabet}.html`, '', 'item'); // eslint-disable-line
         // tar add 1606071146 品牌链接处理
         product.brandUrl = helpers.urlFormat('', '', product.brand_domain);
@@ -175,6 +205,10 @@ exports.processProductList = (list, options) => {
         // 备注：如果以后APP的接口太多，可以把这边参数提取出来，变成一个公共的方法来生成，便于以后管理维护
         if (options.isApp) {
             product.url += `?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":'${product.product_id}'}}`; // eslint-disable-line
+        } else if (itemFrom) {
+            // 累加商品数量
+            itemNum++;
+            product.url += `?${itemFrom}${itemNum}`;
         }
         if (options.showTags) {