Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/detailFix

@@ -1250,13 +1250,23 @@
 ### 支付中心
 ### 支付中心
 
 
     {
     {
-        'payAppInfo' : {
-            'appIcon' : 'http://static.yohobuy.com/images/icon.png',
-            'payLink' : '/weixin/pay/'
-            'app' : '微信支付',
-            'hint' : '需下载微信客户端',
-            'subHint' : '推荐使用'
-        }
+        'payAppInfo' : [
+                {
+                    'appIcon' : 'http://static.yohobuy.com/images/icon.png',
+                    'payLink' : '/weixin/pay/',
+                    'appId': 'weixin',
+                    'app' : '微信支付',
+                    'hint' : '需下载微信客户端',
+                    'subHint' : '推荐使用'
+                },{
+                    'appIcon' : 'http://static.yohobuy.com/images/icon.png',
+                    'payLink' : '/weixin/pay/',
+                    'appId': 'baidu',
+                    'app' : '百度支付',
+                    'hint' : '需下载微信客户端',
+                    'subHint' : '推荐使用'
+                }
+            ]
     }
     }
 
 
 ### 物流详情
 ### 物流详情
@@ -1266,9 +1276,14 @@
         'logisticUrl' : 'http://www.shunfeng.com',
         'logisticUrl' : 'http://www.shunfeng.com',
         'logisticCompany' : '顺丰',
         'logisticCompany' : '顺丰',
         'logisticNumber' : '1231231231',
         'logisticNumber' : '1231231231',
-        'logisticDetail' : {
-            'status' : '南京市 派送中',
-            'date' : '2015-12-03'
-        }
+        'logisticDetail' : [
+                {
+                    'status' : '南京市 派送中',
+                    'date' : '2015-12-03'
+                }, {
+                    'status' : '南京市 准备中',
+                    'date' : '2015-12-03'
+                }
+            ]
     }
     }
 
 

@@ -18,13 +18,14 @@ var introUrl = $('#introUrl').val(),
 var sizeSwiper,
 var sizeSwiper,
     refSwiper;
     refSwiper;
 
 
-require('../recommend-for-you.js');
-
 //判断是否要显示向左滑动提示
 //判断是否要显示向左滑动提示
 function hiddenTips($ele) {
 function hiddenTips($ele) {
+    var offsetContainer,
+        offsetLastColumn;
+
     if ($ele.length > 0) {
     if ($ele.length > 0) {
-        var offsetContainer = $ele[0].getBoundingClientRect().right;
-        var offsetLastColumn = $ele.find('.swiper-slide:last-child')[0].getBoundingClientRect().right;
+        offsetContainer = $ele[0].getBoundingClientRect().right;
+        offsetLastColumn = $ele.find('.swiper-slide:last-child')[0].getBoundingClientRect().right;
 
 
 
 
         if (offsetLastColumn - offsetContainer < 0) {
         if (offsetLastColumn - offsetContainer < 0) {

@@ -19,6 +19,7 @@ var $cart = $('.cart-bar');
 
 
 require('./desc');
 require('./desc');
 require('./comments-consults');
 require('./comments-consults');
+require('../recommend-for-you-product-desc');
 
 
 //add extra marign-bottom for footer to show the yoho copyright
 //add extra marign-bottom for footer to show the yoho copyright
 function showFooter() {
 function showFooter() {

-/**
- *  商品详情  --滚动页面加载
- * @author: Lynnic
- * @date: 2015/11/25
- */
-
-// var $ = require('jquery'),
-//     loading = require('../../plugin/loading'),
-//     tip = require('../../plugin/tip');
-
-// var loadMoreUrl = $('#loadMoreUrl').val(),
-//     $commentsDiv = $('#goods-comments'),
-//     $consultsDiv = $('#goods-consults'),
-//     winH = $(window).height(),
-//     searching = false,
-//     end = false;
-
-// var jsonObj;
-
-// //插入评论列表底部
-// function insertCommentsDiv(json) {
-//     var html = '';
-//     var i;
-
-
-//     for (i = 0; i < json.length; i++) {
-//         html += '<div class="comment-item">';
-//         html += '<span class="user-name">' + json[i].userName + '</span>';
-//         html += '<span class="goods-spec">' + json[i].desc + '</span>';
-//         html += '<span class="goods-spec">' + json[i].content + '</span>';
-//         html += '<span class="goods-spec">' + json[i].time + '</span>';
-//     }
-//     $commentsDiv.append(html);
-// }
-
-// //插入咨询列表底部
-// function insertConsultsDiv(json) {
-//     var html = '';
-//     var i;
-
-
-//     for (i = 0; i < json.length; i++) {
-//         html += '<div class="consult-item"> ';
-//         html += '<div class="question"> ';
-//         html += '<span class="iconfont">&#xe639;</span> ';
-//         html += '<p> ';
-//         html += json[i].question + '<br> ';
-//         html += '<span class="time">' + json[i].time + '</span> ';
-//         html += '</p> ';
-//         html += '</div> ';
-
-//         html += '<div class="answer"> ';
-//         html += '<span class="iconfont">&#xe63c;</span> ';
-//         html += '<p>' + json[i].answer + '</p> ';
-//         html += '</div> ';
-//         html += '</div> ';
-//     }
-//     $consultsDiv.append(html);
-// }
-
-// function search() {
-//     if (searching || end) {
-//         return;
-//     }
-//     searching = true;
-
-//     loading.showLoadingMask();
-
-//     $.ajax({
-//         type: 'GET',
-//         url: loadMoreUrl,
-//         success: function(data) {
-//             if (data.length > 0) {
-//                 jsonObj = JSON.parse(data);
-//                 if ($commentsDiv.length > 0) {
-//                     insertCommentsDiv(jsonObj);
-//                 } else if ($consultsDiv.length > 0) {
-//                     insertConsultsDiv(jsonObj);
-//                 }
-//             }
-//             searching = false;
-//             end = true;
-//             loading.hideLoadingMask();
-//         },
-//         error: function() {
-//             tip.show('网络断开连接了~');
-//             searching = false;
-//             loading.hideLoadingMask();
-//         }
-//     });
-// }
-
-
-// function scrollHandler() {
-//     if (!end || $(window).scrollTop() + winH >= $(document).height() - 50) {
-//         search();
-//     }
-// }
-
-// //srcoll to load more
-// $(window).scroll(function() {
-//     window.requestAnimationFrame(scrollHandler);
-// });

@@ -8,6 +8,6 @@ require('./newsale/newarrival');
 require('./newsale/discount');
 require('./newsale/discount');
 require('./list');
 require('./list');
 require('./detail/detail');
 require('./detail/detail');
-require('./detail/loadmore');
 require('./detail/consultform');
 require('./detail/consultform');
-require('./newsale/hot-rank');
+require('./newsale/hot-rank');
+

+/**
+ * 为您优选
+ * @author: liangzhifeng<zhifeng.liang@yoho.cn>
+ * @date: 2015/11/16
+ */
+
+
+var Swiper = require('yoho.iswiper'),
+    $ = require('jquery');
+
+var recommendSwiper,
+    $recommendForYou = $('.recommend-for-you'),
+    preferenceUrl = $('#preferenceUrl').val();
+
+if (preferenceUrl) {
+    $.get(preferenceUrl).then(function(html) {
+        $recommendForYou.html(html).show();
+        if ($('#swiper-recommend').length) {
+            recommendSwiper = new Swiper('#swiper-recommend', {
+                slidesPerView: 'auto',
+                grabCursor: true,
+                slideElement: 'a',
+                lazyLoading: true,
+                watchSlidesVisibility: true
+            });
+        }
+    }).fail(function() {
+        $recommendForYou.hide();
+    });
+}

@@ -24,7 +24,7 @@
             width: pxToRem(126px);
             width: pxToRem(126px);
             height: pxToRem(126px);
             height: pxToRem(126px);
             border-radius: 50%;
             border-radius: 50%;
-            border: pxToRem(6px) solid #a7a8a9; 
+            border: pxToRem(6px) solid #a7a8a9;
             background-image: image-url("me/index/user-avatar.png");
             background-image: image-url("me/index/user-avatar.png");
             background-size: 100%;
             background-size: 100%;
         }
         }
@@ -46,7 +46,7 @@
         }
         }
 
 
         .vip-3 {
         .vip-3 {
-            @include rem-sprite($vip, vip-3); 
+            @include rem-sprite($vip, vip-3);
         }
         }
 
 
         .vip-2 {
         .vip-2 {
@@ -91,7 +91,7 @@
             font-size: pxToRem(22px);
             font-size: pxToRem(22px);
             line-height: pxToRem(38px);
             line-height: pxToRem(38px);
             width: pxToRem(213px);
             width: pxToRem(213px);
-            
+
             &:after {
             &:after {
                 content: '';
                 content: '';
                 position: absolute;
                 position: absolute;
@@ -153,16 +153,17 @@
 
 
                 .num {
                 .num {
                     position: absolute;
                     position: absolute;
-                    padding: 0 pxToRem(8px);
-                    top: 0;
-                    right: pxToRem(40px);
-                    min-width: pxToRem(16px);
-                    font-size: pxToRem(24px);
-                    line-height: pxToRem(32px);
+                    top: pxToRem(-24px);
+                    right: pxToRem(36px);
+                    width: pxToRem(72px);
+                    height: pxToRem(72px);
+                    font-size: pxToRem(40px);
+                    line-height: pxToRem(72px);
                     color: #fff;
                     color: #fff;
-                    background: #F03D35;
+                    background: #f03d35;
                     text-align: center;
                     text-align: center;
-                    border-radius: pxToRem(20px);
+                    border-radius: 50%;
+                    @include transform(scale(0.5));
                 }
                 }
             }
             }
 
 
@@ -184,7 +185,7 @@
             padding: 0 pxToRem(30px);
             padding: 0 pxToRem(30px);
             font-size: pxToRem(32px);
             font-size: pxToRem(32px);
             line-height: pxToRem(88px);
             line-height: pxToRem(88px);
-            
+
             &.highlight {
             &.highlight {
                 background: #eee;
                 background: #eee;
             }
             }
@@ -214,4 +215,4 @@
             float: right;
             float: right;
         }
         }
     }
     }
-}
+}

@@ -142,6 +142,9 @@
     {{#if id}}
     {{#if id}}
     <input id="productId" type="hidden" value="{{id}}">
     <input id="productId" type="hidden" value="{{id}}">
     {{/if}}
     {{/if}}
-    
+    {{#if preferenceUrl}}
+    <input id="preferenceUrl" type="hidden" value="{{preferenceUrl}}">
+    {{/if}}
+
 </div>
 </div>
 {{> layout/footer}}
 {{> layout/footer}}

@@ -46,7 +46,8 @@ class HomeController extends AbstractAction
         $data = array(
         $data = array(
             'myIndexPage' => true,
             'myIndexPage' => true,
             'showDownloadApp' => true,
             'showDownloadApp' => true,
-            'pageFooter' => true
+            'pageFooter' => true,
+            'cartUrl' => Helpers::url('/cart/index/index', null),
         );
         );
         $uid = $this->getUid(true);
         $uid = $this->getUid(true);
         if ($uid) {
         if ($uid) {