Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -2,9 +2,8 @@
     <div class="slide-wrapper">
         <ul>
             {{# slider}}
-                <a href="{{url}}" target= "_blank">
-                    <li class="banner-item" style="{{#if bgColor}}background-color:{{bgColor}}{{/if}}; background-image:url('{{image src 1150 570}}')">
-                </a>
+            <li class="banner-item" style="{{#if bgColor}}background-color:{{bgColor}}{{/if}}; background-image:url('{{image src 1150 570}}')">
+                <a href="{{url}}" target= "_blank"></a>
                 {{# tips}}
                 <div class="slide-tips">
                     <div class="g-mark"></div>

@@ -36,7 +36,6 @@ const _processListData = (list) => {
     });
 
     _.forEach(list.list.artList, (data) => {
-        // console.log(data)
 
         if (data.author) {
             listData = _.assign(listData, {
@@ -230,7 +229,7 @@ const _getRelatedData = (idList) => {
                     cnAlphabet: data.cn_alphabet
                 });
             });
-
+            console.log(productList);
             return productList;
         } else {
             logger.error('推荐商品 cood 不是 200');
@@ -247,6 +246,7 @@ const _getRelatedData = (idList) => {
 const _processContentData = (list) => {
     list = list || [];
     list = camelCase(list);
+    console.log(list);
 
     let contentData = {
         contents: []
@@ -282,6 +282,7 @@ const _processContentData = (list) => {
         if (value.goods) {
 
             _.forEach(value.goods.data, function(data) {
+                console.log(data);
 
                 idList += data.id + ',';
                 related.relatedReco.push(data);
@@ -308,7 +309,10 @@ const _processContentData = (list) => {
 
         if (related.relatedReco) {
             _.forEach(related.relatedReco, function(data, index) {
+                data = _.assign(data, {
 
+                    // link: `${config.siteUrl}/product/list/pro_${result[index].id}_data.${data.productSkc}`
+                });
                 data = _.assign(data, result[index]);
             });
             result.splice(0, recoLength.length);

@@ -87,6 +87,7 @@ const favorite = {
 
                 ret.content.favorite.data = retData;
                 ret.content.banner = thumb;
+                console.log(retData);
             }
 
             res.display('index', ret);

@@ -20,7 +20,10 @@ const getAddressDataAsync = (uid, limit) => {
         method: 'app.address.gethidden',
         uid: uid,
         limit: limit
-    }).then(result => result);
+    }).then(result => {
+        console.log(result);
+        return result;
+    });
 };
 
 

@@ -229,8 +229,6 @@ const _getDetail = (uid, code) => {
         method: 'app.SpaceOrders.detail',
         uid: uid,
         order_code: code
-    }, {
-        cache: 100
     });
 };
 
@@ -249,8 +247,6 @@ const _getUserOrder = (uid, type, page) => {
         type: type,
         page: page,
         limit: pageSize
-    }, {
-        cache: 100
     }).then(result => {
         let orderList = [];
         let total = false;
@@ -314,6 +310,10 @@ const _getUserOrder = (uid, type, page) => {
 
             item.isRefundOrder = ot === 7;
 
+            if (parseInt(item.payLefttime, 10) !== 0) {
+                item.showLeftTime = true;
+            }
+
             if (item.isCancel === 'Y') {
                 item.showBuyBtn = true;
                 item.statusStr = '已取消';
@@ -398,8 +398,6 @@ const getExpressInfo = (uid, code) => {
         method: 'app.express.get',
         uid: uid,
         order_code: code
-    }, {
-        cache: true
     });
 };
 
@@ -511,7 +509,8 @@ const getOrderDetail = (uid, code) => {
         detail.createTime = _convertUnixTime(detail.createTime);
 
         if (detail.isCancel === 'N' &&
-            st === 0) {
+            st === 0 &&
+            parseInt(detail.payLefttime, 10) !== 0) {
             detail.showLeftTime = true;
         }
 

@@ -21,13 +21,15 @@
                 <td class="width-opearte">
                     <div>
                         <span class="blue opreation update-address" data-id="{{address_id}}">修改</span>
-                        {{#if default}}
+                           
+                            <em class="op-sep {{#if default}}hide{{/if}}">|</em>
+                            <span class="blue opreation del-address {{#if default}}hide{{/if}}" data-id="{{address_id}}">删除</span>
+                             {{#if default}}
                             <span class="btn set-default opreation current-default" data-id={{address_id}}>默认地址</span>
-                        {{else}}
-                            <em class="op-sep">|</em>
-                            <span class="blue opreation del-address" data-id="{{address_id}}">删除</span>
-                            <span class="btn set-default opreation " data-id={{address_id}}>设为默认</span>
-                        {{/if}}
+                            {{else}}
+                             <span class="btn set-default opreation " data-id={{address_id}}>设为默认</span>
+                             {{/if}}
+                        
                     </div>
                 </td>
             </tr>

@@ -30,7 +30,8 @@
 
         <div class="way">
             {{#if takeGoods}}
-            <p class="contact">我们会尽快将您的商品发出，请耐心等待，如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank"><span class="iconfont">&#xe61c;</span></a>在线客服</p>
+            <p class="contact">我们会尽快将您的商品发出，请耐心等待，如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank"><span class="iconfont">&#xe61c;</span>在线客服</a>
+            </p>
             {{/if}}
 
             {{#if reminder}}
@@ -50,7 +51,7 @@
             {{/if}}
 
             {{#if doubt}}
-            <p class="contact">如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank"><span class="iconfont">&#xe61c;</span>在线客服</p></a>
+            <p class="contact">如有疑问，请联系<a href="http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=703953&configID=149819&jid=1099911094" target="_blank"><span class="iconfont">&#xe61c;</span>在线客服</a></p>
             {{/if}}
 
             {{#if auditSuccess}}

@@ -22,7 +22,9 @@
                 {{#if showPayButton}}
                 <div class="pay-operation">
                     {{#if isOnlinePaid}}
+                        {{#if showLeftTime}}
                         <span class="iconfont hide-when-invalid">&#xe606;</span><p class="left-time" data-left="{{payLefttime}}"></p>
+                        {{/if}}
                         <a href="{{payUrl}}">
                             <span class="btn red hide-when-invalid">立即付款</span>
                         </a>

@@ -126,7 +126,6 @@
                     <div class="info">
                         <p class="title" title="{{name}}">{{name}}</p>
                         <p>颜色：{{color}}&nbsp;尺码：{{size}}</p>
-                        <p>×{{num}}</p>
                     </div>
                     <div class="reason">{{reason}}</div>
                     <div class="num">{{num}}</div>

@@ -91,10 +91,15 @@ const getProductItemData = (params, url, uid) => {
         let resData = {};
         let data = {};
 
+        // 如果status为0，即商品下架时则返回空对象
+        if (!result.status) {
+            return resData;
+        }
+
         if (!result.productName &&
             !result.erpProductId &&
             !result.productPriceBo) {
-            return data;
+            return resData;
         }
 
         result.uid = uid;

@@ -106,8 +106,8 @@ if (isProduction) {
     Object.assign(module.exports, {
         appName: 'www.yohoblk.com for test',
         domains: {
-            api: 'http://api-test1.yohops.com:9999/',
-            service: 'http://service-test1.yohops.com:9999/',
+            api: 'http://testapi.yoho.cn:28078/',
+            service: 'http://testservice.yoho.cn:28077/',
             search: 'http://192.168.102.216:8080/yohosearch/'
         },
         useOneapm: true,
@@ -118,9 +118,6 @@ if (isProduction) {
             session: ['127.0.0.1:12111'],
             timeout: 1000,
             retries: 0
-        },
-        pay: {
-            serviceNotify: 'http://service-test1.yohops.com:9999/'
         }
     });
 }

@@ -74,14 +74,7 @@
                                 </a>
                             </li>
                         </ul>
-                        <div class="hot-search hide">
-                            <a href="#">外套</a>
-                            <a href="#">长裤</a>
-                            <a href="#">大衣</a>
-                            <a href="#">毛衣</a>
-                            <a href="#">图案</a>
-                            <a href="#">简约连衣裙</a>
-                        </div>
+                        <div class="hot-search hide"></div>
                     </div>
                 </div>
             </div>

@@ -77,7 +77,8 @@ function getNavImg(code, dom) {
         },
         success: function(result) {
             if (result.code === 200) {
-                dom.data('show', true).html('<img src="' + result.data.src + '">');
+                dom.data('show', true).html('<a href="' + result.data.url +
+                    '"><img src="' + result.data.src + '" title="' + result.data.title + '"></a>');
             }
         }
     });

@@ -22,6 +22,7 @@ var $commentList = $commentArea.find('.comments-wrap'),
     pag = 0;
 
 require('../plugins/share');
+require('../common/header');
 
 // require('yoho-unslider');
 

@@ -11,6 +11,7 @@ var _alert = dialog.Alert;
 
 require('../common/header');
 require('../common/return-top');
+require('../common/header');
 
 $('.editorial-index-page').on('click', '.like-icon', function() {
     var $this = $(this),
@@ -32,7 +33,7 @@ $('.editorial-index-page').on('click', '.like-icon', function() {
     }).then(function(data) {
         if (data.code === 200) {
             $this.next('b').html(data.data);
-            $this.toggleClass('liked');  
+            $this.toggleClass('liked');
         } else {
             new _alert(data.message).show();
         }

@@ -10,6 +10,7 @@ var _alert = dialog.Alert;
 
 require('../common/header');
 require('../common/return-top');
+require('../common/header');
 
 lazyLoad($('.content-msg img.lazy'));
 

@@ -266,8 +266,12 @@ $(function() {
             },
             success: function(data) {
                 if (data.code === 200) {
+                    $('.del-address').removeClass('hide');
+                    $('.op-sep').removeClass('hide');
                     $('.current-default').removeClass('current-default').text('设为默认');
                     $(self).addClass('current-default').text('默认地址');
+                    $(self).siblings('.del-address').addClass('hide');
+                    $(self).siblings('.op-sep').addClass('hide');
                     tbody.find('.table-body').eq(0).before('<tr class=\'table-body select-row\'>' + tr.html() +
                         '</tr>');
                     tr.remove();
@@ -277,11 +281,12 @@ $(function() {
 
             }
         });
+
     });
 
 
     // 选中某一行
-    $(document).on('click', '.table-body', function() {
+    $(document).on('mousemove', '.table-body', function() {
         $('.table-body').removeClass('select-row');
         $(this).addClass('select-row');
 

@@ -90,7 +90,7 @@ $submitExpress.click(function() {
 $showExpress.on('click', '.reset-express', function() {
     var expressId = $showExpress.data('id');
 
-    $expressCode.val(expressId);
+    $expressCompany.val(expressId);
     $showExpress.addClass('hide');
     $editExpress.removeClass('hide');
 });

@@ -19,7 +19,7 @@
             position: relative;
 
             &.bottom-space {
-                margin-bottom: 15px;
+                margin-bottom: 20px;
             }
 
             &.right-space {
@@ -49,7 +49,7 @@
 
             img {
                 width: $bigImgWidth;
-                height: calc($smallImgHeight*2+$space+4px);
+                height: calc($smallImgHeight*2+$space+10px);
             }
         }
 

@@ -15,6 +15,7 @@
 
     .card {
         height: $height;
+        width: calc($width + $space);
         float: left;
         position: relative;
         box-sizing: border-box;

@@ -166,4 +166,8 @@
         padding: 0 10px;
         color: #999;
     }
+
+    .hide {
+        display: none;
+    }
 }

@@ -67,16 +67,18 @@
         .contact {
             line-height: 50px;
             height: 50px;
-            color: #219dd6;
 
             span {
                 margin-left: 20px;
             }
 
+            a {
+                color: #219dd6;
+            }
+
             .iconfont {
                 font-size: 12px;
                 margin-right: 5px;
-                color: #219dd6;
             }
         }
     }