handle merge

@@ -6,7 +6,7 @@
 'use strict';
 const serviceAPI = global.yoho.ServiceAPI;
 
-// const api = global.yoho.API;
+const api = global.yoho.API;
 const camelCase = global.yoho.camelCase;
 const _ = require('lodash');
 const Promise = require('bluebird');
@@ -258,31 +258,33 @@ const _processHeadData = (list) => {
 
 
 // 推荐商品
-// const _getRelatedData = (id) => {
-//     return api.get('', {
-//         query: id,
-//         method: 'app.search.li'
-//     }).then((result) => {
-//         let productList = {};
-
-//         if (result && result.code === 200) {
-//             // console.log(result);
-//             _.forEach(result.data. product_list, function(data) {
-//                 // console.log(data)
-//                 productList.name = data.product_name;
-//                 productList.price = data.sales_price;
-//                 productList.id = data.product_id;
-//                 productList.cnAlphabet = data.cn_alphabet;
-//             });
+const _getRelatedData = () => {
+    // console.log(id);
+    return api.get('', {
+        query: '51152761,51178582,51146105,51149561,51149414,51082157,51079256',
+        method: 'app.search.li'
+    }).then((result) => {
+        let productList = [];
 
-//             // console.log(productList)
-//             return productList;
-//         } else {
-//             logger.error('推荐商品 cood 不是 200');
-//             return {};
-//         }
-//     });
-// };
+        if (result && result.code === 200) {
+
+            _.forEach(result.data.product_list, function(data) {
+                productList.push({
+                    name: data.product_name,
+                    price: data.sales_price,
+                    id: data.product_id,
+                    cnAlphabet: data.cn_alphabet
+                });
+            });
+
+            // console.log(productList)
+            return productList;
+        } else {
+            logger.error('推荐商品 cood 不是 200');
+            return {};
+        }
+    });
+};
 
 /**
  * 详情页文章内容数据处理
@@ -294,7 +296,8 @@ const _processContentData = (list) => {
     list = camelCase(list);
 
     let contentData = {
-        contents: []
+        contents: [],
+        collecation: []
     };
 
     _.forEach(list, function(value) {
@@ -313,32 +316,46 @@ const _processContentData = (list) => {
 
     contentData.contents = list;
 
-    // console.log(list)
-    // let collocation = {};
+    // let idList = '';
+    let formatData = [];
 
-    // _.forEach(contentData.contents, function(value) {
-    //     // console.log(value)
+    _.forEach(contentData.contents, function(value) {
 
-    //     if (value.goods) {
-    //         console.log(value);
+        if (value.goods) {
 
-    //         _.forEach(value.goods.data, function(data) {
+            _.forEach(value.goods.data, function(data) {
 
-    //             _getRelatedData(51152761).then((result) => {
+                // idList += data.id + ',';
+                // idList = '51152761';
+                formatData.push(data);
+            });
+        }
+    });
 
-//                 data = _.assign(data, result);
-//                 data = _.assign(data, {
-//                    link: `${config.siteUrl}/product/pro_${result.id}_${data.productSkc}/${result.cnAlphabet}`
-//                 });
-    //             });
-    //         });
-    //     }
-
-    //     if (value.goodsGroup) {
-    //         _.forEach(value.goodsGroup.data, function(data) {
-    //             // console.log(data)
-    //             _.forEach(data.list, function(value) {
-    //                 // console.log(value)
+    // console.log(formatData)
+
+    _getRelatedData().then((result) => {
+        // formatData.push(result);
+        // console.log(formatData);
+
+        _.forEach(formatData, function(data, index) {
+
+            data[index] = _.assign(result[index]);
+
+        });
+
+        // console.log(formatData);
+        return formatData;
+
+    }).then(() => {
+
+    });
+
+// if (value.goodsGroup) {
+//     _.forEach(value.goodsGroup.data, function(data) {
+//         // console.log(data)
+//         _.forEach(data.list, function(value) {
+//             // console.log(value)
 //         _getRelatedData(51152761).then((result) => {
 //                 // console.log(result)
 //                 value = _.assign(value, result);
@@ -348,10 +365,9 @@ const _processContentData = (list) => {
 
 //                 // console.log(value)
 //             });
-    //             });
-    //         });
-    //     }
-    // });
+//         });
+//     });
+// }
 
     return contentData;
 };

@@ -42,7 +42,7 @@
                     </div>
                 {{/ text}}
 
-                {{!-- {{# goods}}
+                {{# goods}}
                     <div class="related-reco">
                         <div class="article-title">
                             <div class="title-line"></div>
@@ -80,7 +80,7 @@
                         {{/ data}}
                         </div>
                     </div>
-                {{/ goodsGroup}} --}}
+                {{/ goodsGroup}}
             {{/ content}}
 
             {{#if brands}}

@@ -143,6 +143,7 @@ const exchangeDeatail = (req, res) => {
                 navigation: mcHandler.getSideMenu('我的退/换货'),
                 banner: 'http://placehold.it/{width}x{height}',
                 returns: {
+                    title: '换货详情',
                     exchange: result.exchangeDetail
                 }
             }

@@ -234,11 +234,7 @@ const _setRefundGoodList = (data) => {
             goods.push({
                 href: helpers.urlFormat(`/product/pro_${value.product_id}_${value.goods_id}/${cnAlphabet}.html`),
                 img: value.goods_image,
-                name: _.truncate(value.product_name, {
-                    length: 34,
-                    omission: '...'
-                }),
-                title: value.product_name,
+                name: value.product_name,
                 size: value.size_name,
                 color: value.color_name,
                 num: 1, // 接口目前不支持
@@ -361,11 +357,7 @@ const _setRefundDetailData = (data) => {
     _.forEach(data.goods_list, value => {
         goods.push({
             img: value.goods_image,
-            name: _.truncate(value.product_name, {
-                length: 34,
-                omission: '...'
-            }),
-            title: value.product_name,
+            name: value.product_name,
             size: value.size_name,
             color: value.color_name,
             num: 1, // 接口目前不支持
@@ -408,69 +400,6 @@ const _setExpressData = (data) => {
 };
 
 /**
- * 设置换货详情数据
- * @function _setExchangeDetailData
- * @param { Object } data 接口返回换货订单数据
- * @return { Object } 模板渲染换货数据
- */
-const _setExchangeDetailData = (data) => {
-    data = camelCase(data);
-
-    let list = {};
-
-    switch (data.status) {
-        case 0:
-            Object.assign(list, {
-                audit: true,
-                reminder: true
-            });
-            break;
-        case 10:
-            Object.assign(list, {
-                through: true,
-                reminder: true
-            });
-
-            if (data.deliveryTpyeName === '寄回换货') {
-                Object.assign(list, {
-                    logistics: true,
-                    sendBack: true,
-                    exchangeAddress: returnAddress
-                });
-            } else {
-                list.inDoor = true;
-            }
-
-            break;
-        case 30:
-            if (data.deliveryTpyeName === '寄回换货') {
-                list.takeGoods = true;
-            }
-            break;
-        case 50:
-            Object.assign(list, {
-                send: true,
-                reminder: true,
-                auditSuccess: true
-            });
-            break;
-        case 40:
-            Object.assign(list, {
-                finish: true,
-                auditSuccess: true
-            });
-            break;
-        case 91:
-            list.abolish = true;
-            break;
-        default:
-            break;
-    }
-
-    return list;
-};
-
-/**
  * 获取退货商品信息
  * @function getRefundGoodsData
  * @param { number } orderCode 订单号
@@ -645,6 +574,93 @@ const getChangeGoodsList = (orderCode, uid) => {
 };
 
 /**
+ * 设置换货详情数据
+ * @function _setExchangeDetailData
+ * @param { Object } data 接口返回换货订单数据
+ * @return { Object } 模板渲染换货数据
+ */
+const _setExchangeDetailData = (data) => {
+    data = camelCase(data);
+    console.log(data);
+    let list = {};
+
+    switch (data.status) {
+        case 0:
+            if (data.deliveryTpyeName === '寄回换货') {
+                Object.assign(list, {
+                    audit: true,
+                    reminder: true,
+                    inDoor: false,
+                    sendBack: true,
+                    cancel: true,
+                    location: true
+                });
+            } else {
+                Object.assign(list, {
+                    audit: true,
+                    reminder: true
+                });
+            }
+
+            break;
+        case 10:
+            Object.assign(list, {
+                through: true,
+                reminder: true
+            });
+
+            if (data.deliveryTpyeName === '寄回换货') {
+                Object.assign(list, {
+                    logistics: true,
+                    sendBack: true,
+                    exchangeAddress: returnAddress,
+                    cancel: true,
+                    location: true
+                });
+            } else {
+                list.inDoor = true;
+            }
+
+            break;
+        case 20:
+
+            if (data.deliveryTpyeName === '寄回换货') {
+                Object.assign(list, {
+                    logistics: true
+                });
+            }
+
+            break;
+        case 30:
+            if (data.deliveryTpyeName === '寄回换货') {
+                list.takeGoods = true;
+                list.auditSuccess = true;
+            }
+            break;
+        case 50:
+            Object.assign(list, {
+                send: true,
+                doubt: true,
+                auditSuccess: true
+            });
+            break;
+        case 40:
+            Object.assign(list, {
+                finish: true,
+                auditSuccess: true
+            });
+            break;
+        case 91:
+            list.abolish = true;
+            break;
+        default:
+            break;
+    }
+
+    return list;
+};
+
+/**
  * 获取换货详情信息
  * @function getExchangeDetailData
  * @param { number } id 换货申请单号

@@ -30,7 +30,7 @@
         <div class="way">
 
             {{#if takeGoods}}
-            <p class="contact">我们会尽快将您的商品发出，请耐心等待，如有疑问，请联系<span class="iconfont">&#xe61c;</span>在线客服</p>
+            <p class="contact">我们会尽快将您的商品发出，请耐心等待，如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409"><span class="iconfont">&#xe61c;</span>在线客服</p></a>
             {{/if}}
 
             {{#if reminder}}
@@ -45,28 +45,37 @@
             {{/if}}
             {{/if}}
 
-            {{#if audit}}
+            {{#if cancel}}
             <p class="cancel">如果您不想换货了，您可以<span class="cancel-btn">取消申请</span></p>
             {{/if}}
 
-            {{#if finish}}
+            {{#if doubt}}
             <p class="contact">如有疑问，请联系<span class="iconfont">&#xe61c;</span>在线客服</p>
             {{/if}}
 
+            {{#if auditSuccess}}
+            <div class="order">
+                <span class="check">查看</span>
+                <span class="exchange-order">换货订单</span>
+            </div>
+            {{/if}}
+
+        </div>
+
         {{#if logistics}}
         <div class="return-express">
-                {{#if number}}
+            {{#if expressNumber}}
                 <div class="show-content" data-id="{{id}}">
                     <h4 class="third-title">寄回物流信息 <label class="reset-express btn white">修改</label></h4>
                     <p>请您耐心等待，我们会在收到货物后快速为您处理</p>
-                        <p>物流公司：{{company}}</p>
-                        <p>快递单号：{{number}}</p>
+                    <p>物流公司：{{ expressCompany}}</p>
+                    <p>快递单号：{{expressNumber}}</p>
                 </div>
             {{/if}}
 
-                <div class="edit-content{{#if number}} hide{{/if}}"{{# expressList}} data-{{id}}="{{name}}"{{/ expressList}}>
+            <div class="edit-content{{#if expressNumber}} hide{{/if}}"{{# expressList}} data-{{id}}="{{name}}"{{/ expressList}}>
                 <h4 class="third-title">填写物流</h4>
-                    <p>请您在<span class="blue">7月30日24:00</span>前将商品寄回并填写物流，逾期将自动取消申请</p>
+                <p>请您在<span class="blue">七天内</span>将商品寄回并填写物流，逾期将自动取消申请</p>
                 <dl class="express-wrap">
                     <dd>
                         物流公司：
@@ -99,14 +108,6 @@
         </div>
         {{/ exchangeAddress}}
 
-            {{#if auditSuccess}}
-            <div class="order">
-                <span class="check">查看</span>
-                <span class="exchange-order">换货订单</span>
-            </div>
-            {{/if}}
-        </div>
-
         {{#if location}}
         <div class="address">
             <p class="address-title">收货地址<span class="modify-btn">修改</span></p>

@@ -31,7 +31,6 @@
                 </div>
                 {{/if}}
                 {{#if showEditOption}}
-                <p class="subtext">评价晒单</p>
                 <a href="{{refundUrl}}" class="{{#if hideChange}}disable{{/if}}">
                     <p class="subtext">申请退货</p>
                 </a>

@@ -120,10 +120,10 @@
             {{# goods}}
                 <div class="goods-item clearfix">
                     <div class="img">
-                        <img class="lazy" title="{{title}}" data-original="{{image img 70 90}}">
+                        <img class="lazy" title="{{name}}" data-original="{{image img 70 90}}">
                     </div>
                     <div class="info">
-                        <p><span title="{{title}}">{{name}}</span></p>
+                        <p class="title" title="{{name}}">{{name}}</p>
                         <p>颜色：{{color}}&nbsp;尺码：{{size}}</p>
                         <p>×{{num}}</p>
                     </div>

@@ -17,12 +17,12 @@
                 <div class="goods-item clearfix">
                     <div class="check" data-skn="{{skn}}" data-skc="{{skc}}" data-sku="{{sku}}" data-price="{{price}}" data-type="{{typeId}}">{{> icon/checkbox}}</div>
                     <div class="img">
-                        <a href="{{href}}" title="{{title}}" target="_blank">
+                        <a href="{{href}}" title="{{name}}" target="_blank">
                             <img class="lazy" data-original="{{image img 70 90}}">
                         </a>
                     </div>
                     <div class="info">
-                        <p><a href="{{href}}" class="title" title="{{title}}" target="_blank">{{name}}</a></p>
+                        <p><a href="{{href}}" class="title" title="{{name}}" target="_blank">{{name}}</a></p>
                         <p>颜色：{{color}}&nbsp;尺码：{{size}}</p>
                         <p>×{{num}}</p>
                     </div>

@@ -20,9 +20,16 @@ var id = $mainWrap.data('id'),
 
 $('.blk-footer .return-top').remove(); // 移除通用的返回顶部组件
 
+require('yoho-jquery-dotdotdot');
+
 require('../common/header'); // header
 require('../common/return-top'); // return-top
 
+// dot
+$('.goods-item .title').dotdotdot({
+    wrap: 'letter'
+});
+
 function cancelRefundApply() {
     $.ajax({
         type: 'POST',

@@ -36,12 +36,19 @@ var checked;
 
 $('.blk-footer .return-top').remove(); // 移除通用的返回顶部组件
 
+require('yoho-jquery-dotdotdot');
+
 require('../plugins/check');
 require('../common/header'); // header
 require('../common/return-top'); // return-top
 
 lazyload($('img.lazy'));
 
+// dot
+$('.goods-item .title').dotdotdot({
+    wrap: 'letter'
+});
+
 function setUnionList(list) {
     var i, html = '';
 

@@ -2,6 +2,11 @@
     .state {
         font-size: 16px;
         color: #5cb0de;
+        margin-top: 45px;
+        display: block;
+        height: 35px;
+        line-height: 35px;
+        margin-bottom: 10px;
 
         span {
             font-size: 20px;
@@ -33,12 +38,12 @@
         }
 
         p {
-            line-height: 22px;
+            line-height: 25px;
+            display: block;
         }
 
         .cancel {
             display: block;
-            margin-top: 18px;
             width: 220px;
             height: 50px;
             line-height: 50px;
@@ -133,6 +138,8 @@
         font-size: 16px;
         height: 50px;
         line-height: 50px;
+        margin-top: 10px;
+        display: block;
     }
 
     .table {
@@ -153,13 +160,13 @@
             }
 
             .info {
-                width: 496px;
+                width: 507px;
                 text-align: left;
             }
 
             .st,
             .op {
-                width: 206px;
+                width: 200px;
             }
         }
     }
@@ -293,7 +300,20 @@
     }
 
     .edit-content {
-        margin: 30px 0;
+        margin: 30px 0 10px;
+        border-bottom: 1px solid #eee;
+
+        p {
+            height: 32px;
+            line-height: 32px;
+            display: block;
+        }
+    }
+
+    .third-title {
+        height: 35px;
+        line-height: 35px;
+        display: block;
     }
 
     .submit-express {
@@ -313,4 +333,43 @@
         }
     }
 
+    .express-wrap {
+        margin-bottom: 10px;
+
+        dd {
+            height: 35px;
+        }
+
+        .submit-express {
+            margin-left: 70px;
+        }
+    }
+
+    .show-content {
+        margin-top: 25px;
+        padding-bottom: 20px;
+        border-bottom: 1px solid #eee;
+
+        h4 {
+            dislay: block;
+            width: 160px;
+            height: 30px;
+            line-height: 30px;
+        }
+
+        p {
+            display: block;
+            height: 25px;
+            line-height: 25px;
+        }
+
+        .reset-express {
+            width: 40px;
+            height: 20px;
+            float: right;
+            line-height: 20px;
+            margin-top: 5px;
+        }
+    }
+
 }

@@ -157,6 +157,12 @@
                 line-height: 2;
             }
 
+            .title {
+                display: block;
+                max-height: 42px;
+                overflow: hidden;
+            }
+
             .reason,
             .num {
                 line-height: 90px;

@@ -73,6 +73,12 @@
                 line-height: 1.5;
             }
 
+            .title {
+                display: block;
+                max-height: 42px;
+                overflow: hidden;
+            }
+
             .title:hover {
                 text-decoration: underline;
             }