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

@@ -596,12 +596,12 @@ class Helpers
             } elseif ($value['goods_type'] == 'gift' && !isset($value['isAdvanceBuy'])) {
             } elseif ($value['goods_type'] == 'gift' && !isset($value['isAdvanceBuy'])) {
                 $oneGoods['isGift'] = true;
                 $oneGoods['isGift'] = true;
                 $oneGoods['salesPrice'] = self::transPrice($value['sales_price']);
                 $oneGoods['salesPrice'] = self::transPrice($value['sales_price']);
-                $oneGoods['price'] = self::transPrice($value['sale_price']);
+                $oneGoods['price'] = self::transPrice($value['last_price']);
             } elseif ($value['goods_type'] == 'price_gift') {
             } elseif ($value['goods_type'] == 'price_gift') {
                 $oneGoods['showCheckbox'] = true;
                 $oneGoods['showCheckbox'] = true;
                 $oneGoods['isAdvanceBuy'] = true;
                 $oneGoods['isAdvanceBuy'] = true;
                 $oneGoods['salesPrice'] = self::transPrice($value['sales_price']);
                 $oneGoods['salesPrice'] = self::transPrice($value['sales_price']);
-                $oneGoods['price'] = self::transPrice($value['sale_price']);
+                $oneGoods['price'] = self::transPrice($value['last_price']);
             } else {
             } else {
                 $oneGoods['showCheckbox'] = true;
                 $oneGoods['showCheckbox'] = true;
             }
             }

@@ -42,6 +42,11 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
     var goodsList = [],
     var goodsList = [],
         goodInfo = {};
         goodInfo = {};
 
 
+    if (!$this.hasClass('icon-cb-checked') && $this.siblings('.info').find('.low-stocks').length > 0) {
+        tip.show('库存不足，无法购买');
+        return false;
+    }
+
     goodInfo.goods_type = $('#cartType').val();
     goodInfo.goods_type = $('#cartType').val();
     goodInfo.selected = $this.hasClass('icon-cb-checked') ? 'N' : 'Y';
     goodInfo.selected = $this.hasClass('icon-cb-checked') ? 'N' : 'Y';
     goodInfo.product_sku = id;
     goodInfo.product_sku = id;

@@ -28,6 +28,7 @@ function nextStep(url, mobileNo, areaCode) {
     }
     }
 
 
     requested = true;
     requested = true;
+    $btnNext.addClass('disable').html('绑定中...');
 
 
     $.ajax({
     $.ajax({
         type: 'POST',
         type: 'POST',
@@ -37,11 +38,13 @@ function nextStep(url, mobileNo, areaCode) {
             areaCode: areaCode.replace('+', '')
             areaCode: areaCode.replace('+', '')
         },
         },
         success: function(res) {
         success: function(res) {
-            console.log(res.data);
+
+            // console.log(res.data);
             location.href = url;
             location.href = url;
         },
         },
         error: function() {
         error: function() {
             tip.show('出错了，请重试！');
             tip.show('出错了，请重试！');
+            $btnNext.removeClass('disable').html('下一步');
             requested = false;
             requested = false;
         }
         }
     });
     });
@@ -86,7 +89,8 @@ $btnNext.on('touchstart', function() {
                 nickname: nickname
                 nickname: nickname
             },
             },
             success: function(res) {
             success: function(res) {
-                console.log(res);
+
+                // console.log(res);
 
 
                 //res : {
                 //res : {
                 //    code: 'xxx',
                 //    code: 'xxx',

@@ -867,6 +867,7 @@ class HomeController extends AbstractAction
 
 
         $this->_view->display('help', array(
         $this->_view->display('help', array(
             'iHelp' => Home\HelpModel::serviceInfo(),
             'iHelp' => Home\HelpModel::serviceInfo(),
+            'pageFooter' => true
         ));
         ));
     }
     }
 
 
@@ -886,6 +887,7 @@ class HomeController extends AbstractAction
 
 
         $this->_view->display('help-detail', array(
         $this->_view->display('help-detail', array(
             'iHelp' => Home\HelpModel::serviceDetail($code),
             'iHelp' => Home\HelpModel::serviceDetail($code),
+            'pageFooter' => true
         ));
         ));
     }
     }