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

@@ -1096,13 +1096,13 @@
             'vipLevel' : {
                 'list' : [
                    {
-                        'text' : '¥284.00'
+                        'text' : '¥284.00',
+                        'currentLevel':true
                     },
                     ...
                 ]
             },
            'goodsDiscount' : {
-                    'listLength' : 2,
                     'list' : [
                            {
                                 'text' : '【BACK TO SCHOOL】满￥499赠送Paul Franke帽子一个，多买多送！'
@@ -1234,12 +1234,29 @@
                 },
 
             'cartInfo' : {
-                    'numInCart' : 3,
-                    'goodsInstore' : 0,
-                    'isCollect':true//
+                    'cartUrl':'购物车url',
+                    'addToCartUrl':'添加购物车url',
+                    'soldOut':'已售罄',
+                    'notForSale':'非卖品'
+            },
+            'introUrl' : '',
+            'id' : '',
+            'preferenceUrl' :''
+        }
+### 咨询列表页面
+        {
+            'link' : '咨询表单跳转url',
+            'consults':{
+                'list' : [
+                    {
+                        'question':'',
+                        'time':'',
+                        'answer':''
+                    }
+                     ...
+                ]
             }
         }
-
 ### 支付中心
 
     {

@@ -42,7 +42,7 @@ class ListProcess
         $products = array();
 
         foreach ($data as $value) {
-            $products[] = Helpers::formatProduct($value, true, true, true);
+            $products[] = Helpers::formatProduct($value, true, true, true, 235, 314);
         }
 
         return $products;

@@ -92,7 +92,7 @@ function callpay(orderCode) {
 function isWXOpen() {
     var ua = window.navigator.userAgent.toLowerCase();
 
-    if (ua.match(/MicroMessenger/i) === 'micromessenger') {
+    if (ua.match(/MicroMessenger/i).toString() === 'micromessenger') {
         return true;
     } else {
         return false;

@@ -16,6 +16,7 @@ var goodsDiscountEl = document.getElementById('goodsDiscount'),
     goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl);
 
 var $cart = $('.cart-bar');
+var UA = navigator.userAgent.toLowerCase().toString();
 
 require('./desc');
 require('./comments-consults');
@@ -81,4 +82,7 @@ $.ajax({
     }
 });
 
+if (UA.indexOf('mqqbrowser') > -1) {
+    $('.detail > div').removeClass('column').addClass('oldbox');
+}
 require('./like');

@@ -280,7 +280,7 @@
                 }
             }
         }
-        
+
         .comment-content-footer,
         .consult-content-footer {
             min-height: pxToRem(88px);
@@ -290,7 +290,7 @@
             line-height: pxToRem(88px);
             font-size: pxToRem(28px);
             a {
-                color: #e0e0e0;
+                color: #b0b0b0;
                 .iconfont {
                     font-size: inherit;
                 }

@@ -46,7 +46,7 @@ $basicBtnC:#eb0313;
                 .column {
                     box-sizing: border-box;
                     //padding: pxToRem(20px) pxToRem(12px);
-                    padding: 4% 3%;
+                    padding: pxToRem(6px) 3%;
                     width: 49.9%;
                     border-bottom: pxToRem(4px) solid #fff;
                     border-right: pxToRem(4px) solid #fff;
@@ -64,6 +64,20 @@ $basicBtnC:#eb0313;
                         flex-basis: 49.9%
                     ))
                 }
+                .oldbox{
+                    padding: pxToRem(6px) 3%;
+                    width: 49.9%;
+                    background-color: $tableCellC;
+                    box-sizing: border-box;
+                    border-bottom: 1px solid #fff;
+                    border-right: 1px solid #fff;
+                    width: 49.9%;
+                    height: 100%;
+                    float: left;
+                    text-overflow:ellipsis;
+                    white-space:nowrap;
+                    overflow:hidden;
+                }
             }
         }
     }

@@ -11,10 +11,6 @@
             background-size: cover;
         }
         .detail{
-            // background-color: $tableCellC;
-            // &.table .inner-container{
-            //     background-color: $tableCellC;
-            // }
             margin-bottom: 1px;
         }
         .desc-text {
@@ -42,30 +38,21 @@
         .detail {
             .material-item{
                 margin: pxToRem(10px) 0;
-                @include flexbox((
-                    display: box,
-                    box-align: center
-                ), $version: 1);
-                @include flexbox((
-                    display: flex,
-                    align-items: center
-                ));
+                width: 100%;
+                height: auto;
+                overflow: hidden;
+                display: block;
+                position: relative;
 
                 img {
                     margin: 0;
                 }
                 .material-image {
                     width: 23%;
-                    @include flexbox((
-                        box-flex: 1.0,
-                        display: box,
-                        box-pack: center
-                    ), $version: 1);
-                    @include flexbox((
-                        display: flex,
-                        flex-basis: 23%,
-                        justify-content: center
-                    ));
+                    position: absolute;
+                    left: 0;
+                    top: 50%; 
+                    @include transform(translateY(-50%))
                 }
                 .material-desc {
                     font-size: pxToRem(24px);
@@ -76,15 +63,8 @@
                     line-height: pxToRem(38px);
                     color: #4b4b4b;
                     word-wrap: break-word;
-                    width: 76.9;
-                    @include flexbox((
-                        box-flex: 1.0,
-                        display: box
-                    ), $version: 1);
-                    @include flexbox((
-                        display: flex,
-                        flex-basis: 76.9%
-                    ));
+                    width: 76.9%;
+                    float: right;
                 }
                 &:last-child{
                     border-bottom: none;

@@ -22,13 +22,9 @@
                             <p>{{answer}}</p>
                     </div>
              </div>
-
              {{/list}}
         </div>
         {{/ consults}}
 
-        {{#if loadmore}}
-        <input id="loadMoreUrl" type="hidden" value="{{loadMoreUrl}}">
-        {{/if}}
 </div>
 {{> layout/footer}}

@@ -201,7 +201,7 @@ class UserModel
                 $datas[] = $product;
             }
             !empty($datas) && $result['hasFavProduct'] = $datas;
-        } else if ($page > 1 && isset($favProduct['code']) && $favProduct['code'] === 500) {
+        } else if ($page > 1 && (!$favProduct || (isset($favProduct['code']) && $favProduct['code'] === 500))) {
             $result['end'] = true;
         }
 
@@ -259,7 +259,7 @@ class UserModel
                 $datas[] = $brand;
             }
             !empty($datas) && $result['hasFavBrand'] = $datas;
-        } else if ($page > 1 && isset($favBrand['code']) && $favBrand['code'] === 500) {
+        } else if ($page > 1 && (!$favBrand || (isset($favBrand['code']) && $favBrand['code'] === 500))) {
             $result['end'] = true;
         }