Merge branch 'develop'

@@ -162,10 +162,12 @@
     }
     }
 
 
     .btn-wrap {
     .btn-wrap {
+        position: relative;
         height: 120rem / $pxConvertRem;
         height: 120rem / $pxConvertRem;
         border-top: 1px solid #e6e6e6;
         border-top: 1px solid #e6e6e6;
         padding: 20rem / $pxConvertRem;
         padding: 20rem / $pxConvertRem;
         text-align: center;
         text-align: center;
+        background: #fff;
         box-sizing: border-box;
         box-sizing: border-box;
 
 
         .btn-sure {
         .btn-sure {

@@ -7,8 +7,6 @@
        position: absolute;
        position: absolute;
        width: 20rem / $pxConvertRem;
        width: 20rem / $pxConvertRem;
        height: 200rem / $pxConvertRem;
        height: 200rem / $pxConvertRem;
-       top: 0.4rem;
-       left: 0;
        background-color: transparent;
        background-color: transparent;
        z-index: 99;
        z-index: 99;
     }
     }
@@ -61,7 +59,6 @@
     }
     }
 
 
     .info {
     .info {
-        position: relative;
         float: left;
         float: left;
         margin-left: 60rem / $pxConvertRem;
         margin-left: 60rem / $pxConvertRem;
         padding: 16rem / $pxConvertRem 0;
         padding: 16rem / $pxConvertRem 0;

@@ -125,7 +125,7 @@
             padding-right: 30rem / $pxConvertRem;
             padding-right: 30rem / $pxConvertRem;
             color: #999;
             color: #999;
             text-align: right;
             text-align: right;
-            width: 360rem / $pxConvertRem;
+            width: 320rem / $pxConvertRem;
             white-space: nowrap;
             white-space: nowrap;
             text-overflow: ellipsis;
             text-overflow: ellipsis;
             overflow: hidden;
             overflow: hidden;

@@ -6,6 +6,7 @@
         margin-bottom: pxToRem(30px);
         margin-bottom: pxToRem(30px);
         padding-left: pxToRem(30px);
         padding-left: pxToRem(30px);
         padding-right: pxToRem(30px);
         padding-right: pxToRem(30px);
+        font-size: pxToRem(24px);
 
 
         input {
         input {
             padding: 0 pxToRem(12px);
             padding: 0 pxToRem(12px);

 .recommend-for-you {
 .recommend-for-you {
-    padding: pxToRem(30px) 0 pxToRem(10px);
+    padding: pxToRem(30px) 0 pxToRem(30px);
     border-top: 1px solid #e0e0e0;
     border-top: 1px solid #e0e0e0;
     border-bottom: 1px solid #e0e0e0;
     border-bottom: 1px solid #e0e0e0;
     background: #fff;
     background: #fff;
@@ -45,11 +45,13 @@
         line-height: 1;
         line-height: 1;
 
 
         .sale-price {
         .sale-price {
+            display: block;
             color: #d9134f;
             color: #d9134f;
             margin-right: pxToRem(8px);
             margin-right: pxToRem(8px);
         }
         }
 
 
         .old-price {
         .old-price {
+            display: block;
             color: #b0b0b0;
             color: #b0b0b0;
             text-decoration: line-through;
             text-decoration: line-through;
         }
         }

@@ -80,19 +80,21 @@ class CartModel
 
 
             $ordinaryCount = strval($cart['ordinary_cart_data']['shopping_cart_data']['goods_count']);
             $ordinaryCount = strval($cart['ordinary_cart_data']['shopping_cart_data']['goods_count']);
             $advanceCount = strval($cart['advance_cart_data']['shopping_cart_data']['goods_count']);
             $advanceCount = strval($cart['advance_cart_data']['shopping_cart_data']['goods_count']);
+            $ordinarySoldOut = empty($cart['ordinary_cart_data']['sold_out_goods_list']);
+            $advanceSoldOut = empty($cart['advance_cart_data']['sold_out_goods_list']);
             // 普通购物车和预售购物车都为空
             // 普通购物车和预售购物车都为空
-            if ($ordinaryCount === '0' && $advanceCount === '0') {
+            if ($ordinaryCount === '0' && $advanceCount === '0' && $ordinarySoldOut && $advanceSoldOut) {
                 $result['isEmptyCart'] = true;
                 $result['isEmptyCart'] = true;
                 break;
                 break;
             }
             }
 
 
             // 普通购物车空，则显示预售购物车
             // 普通购物车空，则显示预售购物车
-            if ($ordinaryCount === '0') {
+            if ($ordinaryCount === '0' && $ordinaryCount) {
                 $result['cartNav'] = false;
                 $result['cartNav'] = false;
                 $result['cartType'] = 'advance';
                 $result['cartType'] = 'advance';
             }
             }
             // 预售购物车空，则显示普通购物车
             // 预售购物车空，则显示普通购物车
-            elseif ($advanceCount === '0') {
+            elseif ($advanceCount === '0' && $advanceSoldOut) {
                 $result['cartNav'] = false;
                 $result['cartNav'] = false;
                 $result['cartType'] = 'ordinary';
                 $result['cartType'] = 'ordinary';
             }
             }
@@ -734,7 +736,7 @@ class CartModel
 
 
         do {
         do {
             // 数据为空时返回空的标志
             // 数据为空时返回空的标志
-            if (empty($data['goods_list'])) {
+            if (empty($data['goods_list']) && empty($data['sold_out_goods_list'])) {
                 break;
                 break;
             }
             }
 
 

@@ -110,6 +110,11 @@ class DetailModel
             }
             }
         }
         }
 
 
+        // 没有商品ID, 则取一次
+        if (empty($productId)) {
+            $productId = isset($baseInfo['id']) ? $baseInfo['id'] : 0;
+        }
+        
         $result['feedbacks'] = array();
         $result['feedbacks'] = array();
 
 
         // 商品咨询
         // 商品咨询