Merge branch 'feature/cart' of git.yoho.cn:fe/yohobuywap-node into feature/cart

@@ -321,7 +321,7 @@ const modify = (req, res, next) => {
         data ? res.json(data) : res.status(400).json({
         data ? res.json(data) : res.status(400).json({
             message: '操作失败'
             message: '操作失败'
         });
         });
-    });
+    }).catch(next);
 };
 };
 
 
 /**
 /**
@@ -351,7 +351,7 @@ const modifyPriceGift = (req, res, next) => {
         data ? res.json(data) : res.status(400).json({
         data ? res.json(data) : res.status(400).json({
             message: '操作失败'
             message: '操作失败'
         });
         });
-    });
+    }).catch(next);
 };
 };
 
 
 /**
 /**
@@ -457,7 +457,7 @@ const giftinfo = (req, res, next) => {
         }) : res.status(400).json({
         }) : res.status(400).json({
             message: '操作失败'
             message: '操作失败'
         });
         });
-    });
+    }).catch(next);
 };
 };
 
 
 module.exports = {
 module.exports = {

@@ -588,11 +588,7 @@ let getProductAsyncData = (data) => {
  * [商品信息格式化异步接口]
  * [商品信息格式化异步接口]
  */
  */
 let _detailDataPkgAsync = (origin, uid, vipLevel, ua) => {
 let _detailDataPkgAsync = (origin, uid, vipLevel, ua) => {
-    let dest = {}, // 结果输出
-        thumbImageList = [],
-        colorGroup = {},
-        sizeGroup = [],
-        totalStorageNum = 0;
+    let dest = {}; // 结果输出
 
 
     // 用户未登录时
     // 用户未登录时
     if (!uid) {
     if (!uid) {
@@ -679,141 +675,8 @@ let _detailDataPkgAsync = (origin, uid, vipLevel, ua) => {
     }
     }
 
 
     // 商品信息
     // 商品信息
-    if (origin.goods_list.length) {
-        let goodsGroup = [],
-            sizeName = '',
-            colorList = [],
-            sizeList = {},
-            allSizeList = {},
-            colorStorageGroup = {},
-            colorStorageNum = 0;
-
-        _.forEach(origin.goods_list, function(value) {
-            // 未上架也显示
-            // if (value.status === 0) {
-            //     return;
-            // }
-
-            colorStorageNum = 0;
-
-            // 商品分组
-            if (value.images_list) {
-                _.forEach(value.images_list, function(good) {
-                    goodsGroup.push({
-                        goodsId: value.goods_id,
-                        img: good.image_url
-                    });
-                });
-            }
-
-            // 商品的尺码列表
-            colorStorageGroup[value.product_skc] = {};
-            if (value.size_list) {
-                sizeList[value.product_skc] = [];
-                _.forEach(value.size_list, function(size) {
-                    sizeList[value.product_skc].push({
-                        id: size.size_id,
-                        skuId: size.product_sku,
-                        goodsId: value.goods_id,
-                        colorId: value.color_id,
-                        name: size.size_name,
-                        sizeNum: size.storage_number,
-                        sizeInfo: size.size_info ? size.size_info : ''
-                    });
-
-                    sizeName = size.size_name;
-
-                    // 所有尺码列表，赋值用于前端展示默认尺码的时候
-                    // 判断出没有库存则显示灰色
-                    let build = {
-                        id: size.size_id,
-                        storage: size.storage_number,
-                        sizeInfo: size.size_info ? size.size_info : ''
-                    };
-
-                    allSizeList[sizeName] = (allSizeList[sizeName] === null ||
-                    typeof allSizeList[sizeName] === 'undefined') ? build : allSizeList[sizeName];
-                    colorStorageNum += parseInt(size.storage_number, 10);
-                    colorStorageGroup[value.product_skc][sizeName] = parseInt(size.storage_number, 10);
-                });
-
-
-                // 颜色分组
-                colorList.push({
-                    id: value.color_id,
-                    skcId: value.product_skc,
-                    name: value.factory_goods_name || value.color_name,
-                    colorNum: colorStorageNum
-                });
-            }
-
-            // 缩略图
-            thumbImageList.push({
-                img: helpers.image(value.color_image, 300, 395)
-            });
-
-            // 商品库存总数
-            totalStorageNum += _.toNumber(colorStorageNum);
-        });
-
-        // 遍历所有尺码，构建颜色显示数据
-        let i = 1;
-
-        sizeGroup[0] = {
-            size: []
-        };
-        _.forEach(allSizeList, (value, key) => {
-
-            // 默认尺码
-            sizeGroup[0].size.push({
-                name: key,
-                sizeNum: _.toNumber(value.storage) > 0 ? true : false,
-                id: value.id,
-                sizeInfo: value.sizeInfo
-            });
-
-            colorGroup[i] = {
-                color: []
-            };
-
-            // 各个颜色的尺码, 每行显示一个尺码对应的颜色
-            _.forEach(colorList, (colorArr) => {
-                let tempColorArr = _.cloneDeep(colorArr);
-
-                if (colorStorageGroup[tempColorArr.skcId] &&
-                    colorStorageGroup[tempColorArr.skcId][key]) {
-                    tempColorArr.colorNum = colorStorageGroup[tempColorArr.skcId][key];
-                } else {
-                    tempColorArr.colorNum = 0;
-                }
-                colorGroup[i].color.push(Object.assign({}, tempColorArr));
-            });
-            colorGroup[i].id = value.id;
-
-            ++i;
-        });
-
-        colorGroup[0] = {
-            color: []
-        };
-
-        // 遍历所有颜色, 构建尺码显示数据
-        i = 1;
-        _.forEach(colorList, function(value) {
-
-            // 各个尺码的颜色， 每行显示一个颜色的对应尺码
-            sizeGroup[i] = {
-                size: sizeList[value.skcId],
-                colorId: value.skcId
-            };
-
-            // 默认颜色
-            colorGroup[0].color.push(value);
-            ++i;
-        });
-
-    }
-    let soldOut = (origin.storage_sum === 0) || (totalStorageNum === 0); // status
+    let cartInfo = productProcess.processSizeInfo(origin);
+    let soldOut = (origin.storage_sum === 0) || (cartInfo.totalStorageNum === 0); // status
     let notForSale = origin.attribute === 2;
     let notForSale = origin.attribute === 2;
     let preSale = (origin.status === 0 && origin.advance_shelve_time > 0);
     let preSale = (origin.status === 0 && origin.advance_shelve_time > 0);
 
 
@@ -827,16 +690,9 @@ let _detailDataPkgAsync = (origin, uid, vipLevel, ua) => {
 
 
         // 显示加入购物车链接
         // 显示加入购物车链接
         if (!soldOut && !notForSale && !preSale || origin.isLimitBuy) {
         if (!soldOut && !notForSale && !preSale || origin.isLimitBuy) {
-            _.orderBy(colorGroup);
-            Object.assign(dest.cartInfo, {
-                productId: origin.product_id,
-                thumbs: thumbImageList,
-                name: dest.goodsName || '',
+            Object.assign(dest.cartInfo, cartInfo, {
                 price: dest.goodsPrice.previousPrice ? dest.goodsPrice.previousPrice : '',
                 price: dest.goodsPrice.previousPrice ? dest.goodsPrice.previousPrice : '',
                 salePrice: dest.goodsPrice.currentPrice ? dest.goodsPrice.currentPrice : '',
                 salePrice: dest.goodsPrice.currentPrice ? dest.goodsPrice.currentPrice : '',
-                totalNum: totalStorageNum,
-                colors: _.toArray(colorGroup),
-                sizes: sizeGroup
             });
             });
 
 
             // 限购商品
             // 限购商品
@@ -889,33 +745,33 @@ let _detailDataPkgAsync = (origin, uid, vipLevel, ua) => {
             dest.cartInfo.preSale = true;
             dest.cartInfo.preSale = true;
         }
         }
         return resolve(dest);
         return resolve(dest);
-    }).then(dest => {
+    }).then(result => {
         // 虚拟商品（门票）
         // 虚拟商品（门票）
         if (origin.attribute * 1 === 3) {
         if (origin.attribute * 1 === 3) {
-            dest.tickets = true;
-            dest.ticketsConfirm = helpers.urlFormat('/cart/index/ticketsConfirm');
+            result.tickets = true;
+            result.ticketsConfirm = helpers.urlFormat('/cart/index/ticketsConfirm');
 
 
             // 展览票
             // 展览票
             if (origin.product_skn * 1 === SINGLE_TICKETS_SKN) {
             if (origin.product_skn * 1 === SINGLE_TICKETS_SKN) {
-                dest.single = true;
+                result.single = true;
             } else {
             } else {
                 // 套票
                 // 套票
-                dest.package = true;
+                result.package = true;
             }
             }
 
 
             // 购票限制
             // 购票限制
-            dest.cartInfo.limit = 4;
+            result.cartInfo.limit = 4;
 
 
             // 清空活动
             // 清空活动
-            dest.goodsDiscount = [];
+            result.goodsDiscount = [];
         }
         }
-        dest.id = origin.product_id;
-        dest.goodsId = origin.goods_id;
-        if (dest.isSecKill === 'Y' && dest.cartInfo.totalNum > 0) {
-            dest.totalNum = 1;
+        result.id = origin.product_id;
+        result.goodsId = origin.goods_id;
+        if (result.isSecKill === 'Y' && result.cartInfo.totalNum > 0) {
+            result.totalNum = 1;
         }
         }
-        return dest;
-    })
+        return result;
+    });
 };
 };
 
 
 
 

@@ -11,7 +11,6 @@
         overflow: hidden;
         overflow: hidden;
         text-align: center;
         text-align: center;
     }
     }
-
     .search-input {
     .search-input {
         position: relative;
         position: relative;
         padding: 14px 30px;
         padding: 14px 30px;
@@ -39,19 +38,10 @@
             border: none;
             border: none;
         }
         }
 
 
-        .btn-intro,
-        .btn-col {
+        .clear-input {
             position: absolute;
             position: absolute;
-            display: block;
-            width: 124px;
-            height: 48px;
-            line-height: 48px;
-            font-size: 12PX;
-            text-align: center;
-            border: 1px solid #fff;
-            color: #fff;
-            top: 50%;
-            margin-top: -24px;
+            top: 10px;
+            right: 100px;
         }
         }
 
 
         .search {
         .search {
@@ -85,183 +75,175 @@
             overflow: hidden;
             overflow: hidden;
         }
         }
 
 
-        .btn-col {
-            right: 30px;
-
-            .iconfont {
-                font-size: 12PX;
-            }
-
-            .brand-name {
-                width: 40%;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-                position: absolute;
-            }
-
-            .brand-thumb {
-                display: block;
-                float: left;
-                width: 150px;
-                height: 80px;
-                margin: 0;
-            }
+        span {
+            font-size: 28px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
 
 
-            .entry {
-                color: #999;
-                font-size: 28px;
-                float: right;
-            }
+        .brand-name {
+            width: 40%;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            position: absolute;
         }
         }
 
 
-        .brand-header {
-            position: relative;
-            height: 150px;
+        .brand-thumb {
+            display: block;
+            float: left;
+            width: 150px;
+            height: 80px;
+            margin: 0;
+        }
 
 
-            > img {
-                display: block;
-                height: 100%;
-                width: 100%;
-            }
+        .entry {
+            color: #999;
+            font-size: 28px;
+            float: right;
         }
         }
+    }
 
 
-        .btn-intro,
-        .btn-col {
-            position: absolute;
+    .brand-header {
+        position: relative;
+        height: 150px;
+
+        > img {
             display: block;
             display: block;
-            width: 124px;
-            height: 48px;
-            line-height: 48px;
-            text-align: center;
-            border: 1px solid #fff;
-            color: #fff;
-            top: 50%;
-            margin-top: -24px;
+            height: 100%;
+            width: 100%;
         }
         }
+    }
 
 
-        .btn-intro {
-            right: 180px;
-        }
+    .btn-intro,
+    .btn-col {
+        position: absolute;
+        display: block;
+        width: 124px;
+        height: 48px;
+        line-height: 48px;
+        font-size: 12PX;
+        text-align: center;
+        border: 1px solid #fff;
+        color: #fff;
+        top: 50%;
+        margin-top: -24px;
+    }
 
 
-        .btn-col {
-            right: 30px;
+    .btn-intro {
+        right: 180px;
+    }
 
 
-            .iconfont {
-                font-size: 24px;
-            }
+    .btn-col {
+        right: 30px;
 
 
-            &.coled {
-                opacity: 0.5;
-            }
+        .iconfont {
+            font-size: 12PX;
+        }
 
 
-            .txt:after {
-                content: "收藏";
-            }
+        &.coled {
+            opacity: 0.5;
+        }
 
 
-            &.coled .txt:after {
-                content: "已收藏";
-            }
+        .txt:after {
+            content: "收藏";
         }
         }
 
 
-        .brand-intro-box {
-            position: fixed;
-            top: 0;
-            left: 0;
-            right: 0;
-            bottom: 0;
-            background: rgba(0, 0, 0, 0.3);
-            padding: 88px 0;
-            z-index: 10;
-            overflow: auto;
-
-            .brand-intro {
-                position: relative;
-                box-sizing: border-box;
-                width: 85%;
-                margin: 0 7.5%;
-                background: #fff;
-                padding: 20px 8%;
-            }
+        &.coled .txt:after {
+            content: "已收藏";
+        }
+    }
 
 
-            h2 {
-                text-align: center;
-                font-size: 34px;
-                line-height: 80px;
-            }
+    .brand-intro-box {
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, 0.3);
+        padding: 88px 0;
+        z-index: 10;
+        overflow: auto;
+
+        .brand-intro {
+            position: relative;
+            box-sizing: border-box;
+            width: 85%;
+            margin: 0 7.5%;
+            background: #fff;
+            padding: 20px 8%;
+        }
 
 
-            .list-nav {
-                border-top: 2px solid #fff;
-                border-bottom: 1px solid #e6e6e6;
-
-                > li {
-                    float: left;
-                    width: 25%;
-                    height: 33PX;
-                    line-height: 33PX;
-                    text-align: center;
-                    font-size: 14PX;
-                }
+        h2 {
+            text-align: center;
+            font-size: 34px;
+            line-height: 80px;
+        }
 
 
-                .fo {
-                    font-size: 36px;
-                    height: 80px;
-                    line-height: 80px;
-                    text-align: center;
+        .con {
+            font-size: 24px;
+            line-height: 32px;
+            padding: 40px 0;
+            border-top: 1px solid #e6e6e6;
+            border-bottom: 1px solid #e6e6e6;
+            overflow-x: hidden;
+        }
 
 
-                    > span {
-                        font-size: 44px;
-                    }
-                }
+        .fo {
+            font-size: 36px;
+            height: 80px;
+            line-height: 80px;
+            text-align: center;
 
 
-                .close-intro {
-                    position: absolute;
-                    top: 12px;
-                    right: 12px;
-                }
+            > span {
+                font-size: 44px;
             }
             }
+        }
 
 
-            .list-nav {
-                border-top: 2px solid #fff;
-                border-bottom: 1px solid #e6e6e6;
-
-                > li {
-                    float: left;
-                    width: 25%;
-                    height: 66px;
-                    line-height: 66px;
-                    text-align: center;
-                    font-size: 28px;
-                }
+        .close-intro {
+            position: absolute;
+            top: 12px;
+            right: 12px;
+        }
+    }
 
 
-                .bytouch {
-                    background: #eee;
-                }
+    .list-nav {
+        border-top: 2px solid #fff;
+        border-bottom: 1px solid #e6e6e6;
 
 
-                a {
-                    display: block;
-                    box-sizing: border-box;
-                    width: 100%;
-                    height: 100%;
-                    color: #999;
-                }
+        > li {
+            float: left;
+            width: 25%;
+            height: 33PX;
+            line-height: 33PX;
+            text-align: center;
+            font-size: 14PX;
+        }
 
 
-                .nav-txt {
-                    display: inline-block;
-                    height: 100%;
-                    box-sizing: border-box;
-                }
+        .bytouch {
+            background: #eee;
+        }
 
 
-                .new .iconfont {
-                    transform: scale(0.8);
-                    font-weight: bold;
-                    font-size: 12PX;
-                }
+        a {
+            display: block;
+            box-sizing: border-box;
+            width: 100%;
+            height: 100%;
+            color: #999;
+        }
 
 
-                .filter .iconfont {
-                    font-size: 12PX;
-                    transition: transform 0.1 ease-in;
-                }
+        .nav-txt {
+            display: inline-block;
+            height: 100%;
+            box-sizing: border-box;
+        }
+
+        .active > a {
+            color: #000;
+
+            .iconfont {
+                color: #999;
 
 
                 &.cur {
                 &.cur {
                     color: #000;
                     color: #000;
@@ -269,6 +251,21 @@
             }
             }
         }
         }
 
 
+        .new .iconfont {
+            transform: scale(0.8);
+            font-weight: bold;
+            font-size: 12PX;
+        }
+
+        .filter .iconfont {
+            font-size: 12PX;
+            transition: transform 0.1 ease-in;
+        }
+
+        .filter.active .iconfont {
+            transform: rotate(-180deg);
+        }
+
         .icon {
         .icon {
             position: relative;
             position: relative;
 
 
@@ -288,85 +285,58 @@
         }
         }
     }
     }
 
 
-    .filter .iconfont {
-        font-size: 24px;
-        transition: transform 0.1 ease-in;
-    }
-
-    .filter.active .iconfont {
-        transform: rotate(-180deg);
+    .no-result {
+        text-align: center;
+        vertical-align: middle;
+        color: #ccc;
+        font-size: 1.2em;
+        margin-top: 440px;
     }
     }
 
 
-    .icon {
+    .goods-container {
         position: relative;
         position: relative;
+        min-height: 880px;
+        padding-left: 0.375rem;
+        padding-top: 0.2rem;
+    }
 
 
-        i {
-            position: absolute;
-            transform: scale(0.8);
-            font-weight: bold;
-        }
+    .new-list {
+        width: 100%;
+        background-color: #fff;
+        font-size: 28px;
+        color: #444;
+        position: absolute;
+        z-index: 5;
+
+        li {
+            margin-left: 35px;
+            height: 88px;
+            line-height: 88px;
+            border-bottom: 1px solid #e0e0e0;
+            padding-right: 38px;
+
+            &:last-child {
+                border-bottom: none;
+            }
 
 
-        .up {
-            top: -22px;
+            &.active {
+                background: resolve('product/shop/check.png') no-repeat 94% center;
+                background-size: 36px 26px;
+            }
         }
         }
+    }
 
 
-        .down {
-            top: -8px;
-        }
+    .suspend-home {
+        bottom: 258px;
     }
     }
-}
-
-.no-result {
-    text-align: center;
-    vertical-align: middle;
-    color: #ccc;
-    font-size: 1.2em;
-    margin-top: 440px;
-}
-
-.goods-container {
-    position: relative;
-    min-height: 880px;
-    padding-left: 0.375rem;
-    padding-top: 0.2rem;
-}
-
-.new-list {
-    width: 100%;
-    background-color: #fff;
-    font-size: 28px;
-    color: #444;
-    position: absolute;
-    z-index: 5;
-
-    li {
-        margin-left: 35px;
-        height: 88px;
-        line-height: 88px;
-        border-bottom: 1px solid #e0e0e0;
-        padding-right: 38px;
-
-        &:last-child {
-            border-bottom: none;
-        }
 
 
-        &.active {
-            background: resolve("product/shop/check.png") no-repeat 94% center;
-            background-size: 36px 26px;
-        }
+    /*搜索分割*/
+    .search-divide {
+        float: left;
+        height: 50px;
+        width: 100%;
+        padding: 10px 0;
+        color: #ccc;
+        text-align: center;
     }
     }
-}
-
-.suspend-home {
-    bottom: 258px;
-}
-
-/* 搜索分割 */
-.search-divide {
-    float: left;
-    height: 50px;
-    width: 100%;
-    padding: 10px 0;
-    color: #ccc;
-    text-align: center;
-}
+}

@@ -6,6 +6,7 @@
 
 
 const helpers = global.yoho.helpers;
 const helpers = global.yoho.helpers;
 const _ = require('lodash');
 const _ = require('lodash');
+const productProcess = require('./product-process');
 
 
 const regPromoTitle = /^【[^】]+】(.*)/;
 const regPromoTitle = /^【[^】]+】(.*)/;
 
 
@@ -203,8 +204,9 @@ const formatPromotion = (promo) => {
  */
  */
 const procGoodsDetail = (productData, num) => {
 const procGoodsDetail = (productData, num) => {
     let data = {};
     let data = {};
+    let sizeInfo = productProcess.processSizeInfo(productData);
 
 
-    data.name = productData.product_name;
+    Object.assign(data, sizeInfo);
     data.productSkn = productData.product_skn;
     data.productSkn = productData.product_skn;
     if (_.has(productData, 'special_price')) { // 加价购或者赠品的销售价字段
     if (_.has(productData, 'special_price')) { // 加价购或者赠品的销售价字段
         data.price = productData.format_market_price;
         data.price = productData.format_market_price;
@@ -222,145 +224,8 @@ const procGoodsDetail = (productData, num) => {
     if (num) {
     if (num) {
         data.num = _.parseInt(num);
         data.num = _.parseInt(num);
     }
     }
-
-    // 商品选择
-    if (_.has(productData, 'goods_list')) {
-        let goodsList = productData.goods_list;
-        let sizeName = '',
-            colors = [],
-            colorList = [],
-            sizes = [],
-            sizeList = {},
-            allSizeList = {}, // 所有尺码列表
-            thumbImageList = [],
-            colorNum = 0,
-            totalStorageNum = 0, // 总库存数
-            colorStorageGroup = {}; // 颜色分组的库存总数集合, 多个之间用/分隔
-
-        goodsList.forEach(val => {
-            // 商品的尺码列表
-            if (!colorStorageGroup[val.product_skc]) {
-                colorStorageGroup[val.product_skc] = {};
-            }
-            if (_.has(val, 'size_list')) {
-                // 尺码
-                if (!sizeList[val.product_skc]) {
-                    sizeList[val.product_skc] = [];
-                }
-                val.size_list.forEach(one => {
-                    sizeName = one.size_name;
-                    sizeList[val.product_skc].push({
-                        id: one.size_id,
-                        skuId: one.product_sku,
-                        goodsId: val.goods_id,
-                        colorId: val.color_id,
-                        name: one.size_name,
-                        sizeNum: _.parseInt(one.storage_number, 10),
-                        sizeInfo: one.size_info ? one.size_info : ''
-                    });
-
-                    // 所有尺码列表，赋值用于前端展示默认尺码的时候 判断出没有库存则显示灰色
-                    allSizeList[sizeName] = !_.has(allSizeList, sizeName) ? {
-                        id: one.size_id,
-                        storage: one.storage_number,
-                        sizeInfo: one.size_info ? one.size_info : ''
-                    } : allSizeList[sizeName];
-
-                    colorNum += _.parseInt(one.storage_number, 10);
-
-                    colorStorageGroup[val.product_skc][sizeName] = _.parseInt(one.storage_number, 10);
-                });
-
-                // 颜色分组
-                colorList.push({
-                    id: val.color_id,
-                    skcId: val.product_skc,
-                    name: val.factory_goods_name || val.color_name,
-                    colorNum: colorNum,
-                    goodsName: productData.product_name
-                });
-            }
-
-            // 缩略图
-            thumbImageList.push({
-                img: helpers.image(val.color_image, 300, 395)
-            });
-
-            // 商品库存总数
-            totalStorageNum += colorNum;
-        });
-
-        // 遍历所有尺码，构建颜色显示数据
-        let i = 1;
-
-        if (!sizes[0]) {
-            sizes[0] = {
-                size: []
-            };
-        }
-        if (!colors[0]) {
-            colors[0] = {
-                color: []
-            };
-        }
-        _.forEach(allSizeList, (value, sName) => {
-            // 默认尺码
-            sizes[0].size.push({
-                name: sName,
-                sizeNum: _.toNumber(value.storage) > 0 ? true : false,
-                id: value.id,
-                sizeInfo: value.sizeInfo
-            });
-
-            // 各个颜色的尺码, 每行显示一个尺码对应的颜色
-            if (!colors[i]) {
-                colors[i] = {
-                    color: []
-                };
-            }
-            colorList.forEach(colorArr => {
-                colors[i].color.push({
-                    id: colorArr.id,
-                    skcId: colorArr.skcId,
-                    name: colorArr.name,
-                    colorNum: _.has(colorStorageGroup, `${colorArr.skcId}.${sName}`) ? _.parseInt(colorStorageGroup[colorArr.skcId][sName], 10) : 0,
-                    goodsName: colorArr.goodsName
-                });
-            });
-
-            colors[i].id = value.id;
-
-            ++i;
-        });
-
-        // 遍历所有颜色, 构建尺码显示数据
-        i = 1;
-        if (!sizes[i]) {
-            sizes[i] = {
-                color: []
-            };
-        }
-        colorList.forEach(value => {
-            // 各个尺码的颜色，每行显示一个颜色的对应尺码
-            sizes[i] = {
-                size: sizeList[value.skcId],
-                colorId: value.skcId
-            };
-
-            // 默认颜色
-            colors[0].color.push(value);
-
-            ++i;
-        });
-        data.thumbs = thumbImageList;
-        data.colors = colors;
-        data.sizes = sizes;
-        data.totalNum = totalStorageNum;
-
-        data.colorName = '颜色';
-        data.sizeName = '尺码';
-    }
-
+    data.colorName = '颜色';
+    data.sizeName = '尺码';
     return data;
     return data;
 };
 };
 
 

@@ -344,3 +344,158 @@ exports.processFilter = (list, options) => {
 
 
     return filters;
     return filters;
 };
 };
+
+/**
+ * 解析尺码弹出框数据
+ */
+exports.processSizeInfo = (origin) => {
+    let cartInfo = {},
+        thumbImageList = [],
+        colorGroup = {},
+        sizeGroup = [],
+        totalStorageNum = 0;
+
+    if (origin.goods_list.length) {
+        let goodsGroup = [],
+            sizeName = '',
+            colorList = [],
+            sizeList = {},
+            allSizeList = {},
+            colorStorageGroup = {},
+            colorStorageNum = 0;
+
+        _.forEach(origin.goods_list, function(value) {
+            // 未上架也显示
+            // if (value.status === 0) {
+            //     return;
+            // }
+
+            colorStorageNum = 0;
+
+            // 商品分组
+            if (value.images_list) {
+                _.forEach(value.images_list, function(good) {
+                    goodsGroup.push({
+                        goodsId: value.goods_id,
+                        img: good.image_url
+                    });
+                });
+            }
+
+            // 商品的尺码列表
+            colorStorageGroup[value.product_skc] = {};
+            if (value.size_list) {
+                sizeList[value.product_skc] = [];
+                _.forEach(value.size_list, function(size) {
+                    sizeList[value.product_skc].push({
+                        id: size.size_id,
+                        skuId: size.product_sku,
+                        goodsId: value.goods_id,
+                        colorId: value.color_id,
+                        name: size.size_name,
+                        sizeNum: size.storage_number,
+                        sizeInfo: size.size_info ? size.size_info : ''
+                    });
+
+                    sizeName = size.size_name;
+
+                    // 所有尺码列表，赋值用于前端展示默认尺码的时候
+                    // 判断出没有库存则显示灰色
+                    let build = {
+                        id: size.size_id,
+                        storage: size.storage_number,
+                        sizeInfo: size.size_info ? size.size_info : ''
+                    };
+
+                    allSizeList[sizeName] = (allSizeList[sizeName] === null ||
+                    typeof allSizeList[sizeName] === 'undefined') ? build : allSizeList[sizeName];
+                    colorStorageNum += parseInt(size.storage_number, 10);
+                    colorStorageGroup[value.product_skc][sizeName] = parseInt(size.storage_number, 10);
+                });
+
+
+                // 颜色分组
+                colorList.push({
+                    id: value.color_id,
+                    skcId: value.product_skc,
+                    name: value.factory_goods_name || value.color_name,
+                    colorNum: colorStorageNum
+                });
+            }
+
+            // 缩略图
+            thumbImageList.push({
+                img: helpers.image(value.color_image, 300, 395)
+            });
+
+            // 商品库存总数
+            totalStorageNum += _.toNumber(colorStorageNum);
+        });
+
+        // 遍历所有尺码，构建颜色显示数据
+        let i = 1;
+
+        sizeGroup[0] = {
+            size: []
+        };
+        _.forEach(allSizeList, (value, key) => {
+
+            // 默认尺码
+            sizeGroup[0].size.push({
+                name: key,
+                sizeNum: _.toNumber(value.storage) > 0 ? true : false,
+                id: value.id,
+                sizeInfo: value.sizeInfo
+            });
+
+            colorGroup[i] = {
+                color: []
+            };
+
+            // 各个颜色的尺码, 每行显示一个尺码对应的颜色
+            _.forEach(colorList, (colorArr) => {
+                let tempColorArr = _.cloneDeep(colorArr);
+
+                if (colorStorageGroup[tempColorArr.skcId] &&
+                    colorStorageGroup[tempColorArr.skcId][key]) {
+                    tempColorArr.colorNum = colorStorageGroup[tempColorArr.skcId][key];
+                } else {
+                    tempColorArr.colorNum = 0;
+                }
+                colorGroup[i].color.push(Object.assign({}, tempColorArr));
+            });
+            colorGroup[i].id = value.id;
+
+            ++i;
+        });
+
+        colorGroup[0] = {
+            color: []
+        };
+
+        // 遍历所有颜色, 构建尺码显示数据
+        i = 1;
+        _.forEach(colorList, function(value) {
+
+            // 各个尺码的颜色， 每行显示一个颜色的对应尺码
+            sizeGroup[i] = {
+                size: sizeList[value.skcId],
+                colorId: value.skcId
+            };
+
+            // 默认颜色
+            colorGroup[0].color.push(value);
+            ++i;
+        });
+        _.orderBy(colorGroup);
+        Object.assign(cartInfo, {
+            productId: origin.product_id,
+            thumbs: thumbImageList,
+            name: origin.product_name || '',
+            totalNum: totalStorageNum,
+            colors: _.toArray(colorGroup),
+            sizes: sizeGroup
+        });
+    }
+    return cartInfo;
+};