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

Conflicts:
	static/js/cart/order-ensure.js

@@ -23,15 +23,17 @@ class Yohobuy
 //     const SERVICE_URL = 'http://service.api.yohobuy.com/';
 //     const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
-   // const API_URL = 'http://apih5.yoho.cn/';
+//    const API_URL = 'http://apih5.yoho.cn/';
 //    const API_URL2 = 'http://apih5.yoho.cn/';
 //    const SERVICE_URL = 'http://serviceh5.yoho.cn/';
 //    const YOHOBUY_URL = 'http://www.yohobuy.com/';
+//    const API_OLD = 'http://api2.open.yohobuy.com/';
 
     /* 测试环境 */
      const API_URL = 'http://testapi.yoho.cn:28078/';
     const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
     const YOHOBUY_URL = 'http://www.yohobuy.com/';
+    const API_OLD = 'http://test2.open.yohobuy.com/';
 
 
     /**

@@ -38,7 +38,7 @@ class HelpData
         $param['code'] = $code;     
         $param['return_type'] = 'html';
         $param['client_secret'] = Sign::getSign($param);
-        return Yohobuy::post(Yohobuy::API_URL, $param, true); 
+        return Yohobuy::post(Yohobuy::API_OLD, $param, true); 
     }
 
     

@@ -129,7 +129,7 @@ class Helpers
      */
     public static function getShoppingKeyByCookie()
     {
-        $cookie = isset($_COOKIE['_Spk']) ? $_COOKIE['_Spk'] : '';
+        $cookie = isset($_COOKIE['_SPK']) ? $_COOKIE['_SPK'] : '';
 
         return $cookie;
     }

@@ -9,21 +9,68 @@ var $ = require('jquery'),
     Hammer = require('yoho.hammer');
 
 var chosePanel = require('./chose-panel'),
+    dialog = require('../me/dialog'),
     tip = require('../plugin/tip');
 
 var $cartContent = $('.cart-content');
 
 var navHammer,
+    advanceBuyHammer,
+    freebieHammer,
     cartType = $('#cartType').val();
 
 var hasChecked = $('.cart-content:not(.hide) .icon-cb-checked').length > 0 ? true : false; //是否有选中商品
 
+function shouldSelectGift() {
+    var $freebie = $('.freebie');
+
+    if ($freebie.length <= 0) {
+        return false;
+    }
+
+    return true;
+}
+
+function shouldLowStocks() {
+    var $lowStocks = $('.low-stocks'),
+        result = false;
+
+    if ($lowStocks.length <= 0) {
+        return result;
+    }
+
+    $lowStocks.each(function(idx, item) {
+        if ($(item).parent().parent().parent().siblings('.checkbox').hasClass('icon-cb-checked')) {
+            result = true;
+            return false;
+        }
+    });
+
+    return result;
+}
+
+function showChooseGifDialog() {
+    dialog.showDialog({
+        dialogText: '您还未选择赠品，是否去选择赠品',
+        hasFooter: {
+            leftBtnText: '我不要赠品',
+            rightBtnText: '去选择'
+        }
+    }, function() {
+        window.location.href = $('.freebie').find('a').attr('href');
+    }, function() {
+        window.location.href = '/cart/index/orderEnsure?cartType=' + cartType;
+    });
+}
+
 require('./good');
 
 lazyLoad($('img.lazy'));
 
 if ('advance' === cartType) {
     $cartContent.toggleClass('hide');
+    $('presell-cart-nav').addClass('active');
+    $('common-cart-nav').removeClass('active');
 }
 
 if ($('.cart-nav').length > 0) {
@@ -37,8 +84,10 @@ if ($('.cart-nav').length > 0) {
 
         if (cartType === 'ordinary') {
             cartType = 'advance';
+            $('#cartType').val('advance');
         } else {
             cartType = 'ordinary';
+            $('#cartType').val('ordinary');
         }
 
         $this.siblings('.active').removeClass('active');
@@ -47,6 +96,8 @@ if ($('.cart-nav').length > 0) {
         //切换普通商品和预售商品购物车显示
         $cartContent.toggleClass('hide');
 
+        hasChecked = $('.cart-content:not(.hide) .icon-cb-checked').length > 0 ? true : false;
+
         //trigger lazyload
         $(window).trigger('scroll');
     });
@@ -56,16 +107,34 @@ if ($('.cart-nav').length > 0) {
     }, 3000);
 }
 
-$('.advance-buy').on('touchend', function() {
-    window.location.href = '/cart/index/advanceBuy?cartType=' + cartType;
-});
+if ($('.advance-buy').length > 0) {
+    advanceBuyHammer = new Hammer(document.getElementsByClassName('advance-buy')[0]);
+    advanceBuyHammer.on('tap', function(e) {
+        window.location.href = '/cart/index/advanceBuy?cartType=' + cartType;
+    });
+}
 
-$('.freebie').on('touchend', function() {
-    window.location.href = '/cart/index/gift?cartType=' + cartType;
-});
+if ($('.freebie').length > 0) {
+    freebieHammer = new Hammer(document.getElementsByClassName('freebie')[0]);
+    freebieHammer.on('tap', function(e) {
+        window.location.href = '/cart/index/gift?cartType=' + cartType;
+    });
+}
+
+//$('.advance-buy').on('touchend', function() {
+//    window.location.href = '/cart/index/advanceBuy?cartType=' + cartType;
+//});
+//
+//$('.freebie').on('touchend', function() {
+//    window.location.href = '/cart/index/gift?cartType=' + cartType;
+//});
 
 $('.btn-balance').on('touchend', function() {
-    if ($('.low-stocks').length > 0) {
+    if (shouldSelectGift()) {
+        showChooseGifDialog();
+        return false;
+    }
+    if (shouldLowStocks()) {
         tip.show('库存不足无法结算');
         return false;
     }
@@ -78,12 +147,10 @@ $('.btn-balance').on('touchend', function() {
 });
 
 $('.chose').on('touchend', function() {
-
-    //var id = $(this).closest('.gift-advance-good').data('id');
     chosePanel.show();
 });
 
-if ($('.cart-zero').length > 0) {
+if ($('.shopping-cart-good').length <= 0) {
     require('../product/recommend-for-you');
 }
 

@@ -70,7 +70,6 @@ function show(html, cb) {
         init();
     }
     $('.chose-panel').show();
-    $('body').css('overflow', 'hidden');
     $num = $('#good-num');
     cbFn = cb;
 }
@@ -78,7 +77,6 @@ function show(html, cb) {
 //隐藏当前Panel
 function hide() {
     $('.chose-panel').hide();
-    $('body').css('overflow', 'auto');
 }
 
 //修改加入购物车的文字和背景
@@ -208,11 +206,11 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
     curColorIndex = index;
     $('#good-num').val(1);
 
-    // 设置按钮的样式和文字
-    updateConformButtonClassAndText();
-
     // 修改颜色时修改商品图片
     changeGoodImgWhenClickColor();
+
+    // 设置按钮的样式和文字
+    updateConformButtonClassAndText();
 }).on('touchstart', '.size-list .block', function() {
     var $this = $(this),
         index,
@@ -232,11 +230,12 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
         $allChoseItems.find('.num .left-num').html('');
         $('#left-num').val(0);
         hasChooseSize = false;
+        curSizeIndex = null;
+        $curSizeBlock = null;
 
         // 当前尺码不是选中状态,选中时
     } else {
         hasChooseSize = true;
-
         curGoodNum = $this.data('num');
 
         // 之前选中的尺码去掉勾选样式
@@ -253,18 +252,21 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
             $('#left-num').val(0);
         }
 
+        if (curGoodNum === 0 && hasChooseColor) {
+            $this.addClass('zero-stock');
+        }
+        curSizeIndex = index;
+        $curSizeBlock = $this;
     }
 
     $this.toggleClass('chosed');
-    curSizeIndex = index;
-    $curSizeBlock = $this;
     $('#good-num').val(1);
 
-    // 设置按钮的样式和文字
-    updateConformButtonClassAndText();
-
     // 重置颜色块的样式
     resetColorZeroStock($siblingBlock);
+
+    // 设置按钮的样式和文字
+    updateConformButtonClassAndText();
 });
 
 $yohoPage.on('touchstart', '.btn-minus', function() {
@@ -281,7 +283,7 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
         return;
     }
     if (num < 0) {
-        tip.show('您选择的数量不能为零~');
+        tip.show('您选择的数量不能为负数~');
         return;
     }
 
@@ -295,7 +297,6 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
         return;
     }
 
-
     if (num - 0 === leftNum || 0 === leftNum) {
         return;
     }

@@ -14,7 +14,6 @@ var dialog = require('../me/dialog'),
     orderInfo = require('./order-info').orderInfo;
 
 var $selectAllBtn = $('.balance .checkbox'),
-    cartType = $('#cartType').val(),
     requesting = false;
 
 ellipsis.init();
@@ -43,7 +42,7 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
     var goodsList = [],
         goodInfo = {};
 
-    goodInfo.goods_type = cartType;
+    goodInfo.goods_type = $('#cartType').val();
     goodInfo.selected = $this.hasClass('icon-cb-checked') ? 'N' : 'Y';
     goodInfo.product_sku = id;
     goodInfo.buy_number = $good.find('.count').eq(0).text().trim().replace('×', '');
@@ -62,7 +61,7 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
             } else {
                 $this.removeClass('icon-checkbox').addClass('icon-cb-checked');
             }
-            window.history.go(0);
+            window.location.href = '/cart/index/index?cartType=' + $('#cartType').val();
         } else if (data.code === 400) {
             tip.show('网络异常');
         }
@@ -186,7 +185,7 @@ function bottomCheckBoxHandeler(isSelected, type, handlerAfterTouch) {
 
 //全选按钮点击事件
 $selectAllBtn.on('touchend', function() {
-    bottomCheckBoxHandeler($(this).hasClass('icon-cb-checked'), cartType, didUpdateAllGoodsCheckStatus);
+    bottomCheckBoxHandeler($(this).hasClass('icon-cb-checked'), $('#cartType').val(), didUpdateAllGoodsCheckStatus);
 });
 
 $('.down').on('touchend', function() {

@@ -23,7 +23,8 @@ var dispatchModeHammer,
     payType,
     priceTmpl = Handlebars.compile($('#tmpl-price').html()),
     queryString = $.queryString(),
-    orderInfo = order.orderInfo;
+    orderInfo = order.orderInfo,
+    isSubmiting;
 
 lazyLoad();
 
@@ -125,6 +126,9 @@ function submitOrder() {
         tip.show('当前地址不支持顺丰快递');
         return;
     }
+    if (isSubmiting) {
+        return false;
+    }
     if (orderInfo('invoice')) {
         if (!invoiceText) {
             tip.show('请输入发票抬头');
@@ -142,6 +146,7 @@ function submitOrder() {
         }
     }
     loading.showLoadingMask();
+    isSubmiting = true;
     $.ajax({
         method: 'POST',
         url: '/cart/index/orderSub',
@@ -182,6 +187,7 @@ function submitOrder() {
     }).fail(function() {
         tip.show('网络出错');
     }).always(function() {
+        isSubmiting = false;
         loading.hideLoadingMask();
     });
 }
@@ -248,3 +254,7 @@ $('.pay-mode').on('click', 'li', function() {
     payType = $this.data('pay-type');
     submitOrder();
 });
+
+$('form').on('submit', function() {
+    return false;
+});

@@ -191,8 +191,8 @@ function getCouponDate() {
 
 getCouponDate();
 
-$(window).scroll(function() {
-    if ($(window).scrollTop() + $(window).height() > $('body').height() * 0.9) {
-        getCouponDate();
-    }
-});
+// $(window).scroll(function() {
+//     if ($(window).scrollTop() + $(window).height() > $('body').height() * 0.9) {
+//         getCouponDate();
+//     }
+// });

@@ -33,7 +33,7 @@ dialogTpl = '<div id="dialog-wrapper" class="dialog-wrapper">' +
 
 dialogTemplate = Handlebars.compile(dialogTpl);
 
-exports.showDialog = function(data, callback) {
+exports.showDialog = function(data, callback, callbackForLeft) {
 
     var dialogStr = dialogTemplate(data),
         $dialogBox,
@@ -76,6 +76,9 @@ exports.showDialog = function(data, callback) {
     dialogWrapperHammer.on('tap', function(event) {
 
         if ($(event.target).hasClass('dialog-left-btn')) {
+            if (typeof callbackForLeft === 'function') {
+                callbackForLeft();
+            }
             $dialogWrapper.fadeOut();
         } else if ($(event.target).hasClass('dialog-right-btn')) {
             callback();

@@ -19,6 +19,9 @@ $.ajax({
             if (count > 99) {
                 count = '99+';
             }
+            if (count === 0) {
+                $('.cart-count').remove();
+            }
             $cart.find('.cart-count').html(count).removeClass('hide');
         }
     }

@@ -5,15 +5,6 @@
         margin-left: 34rem / $pxConvertRem;
         height: 160rem / $pxConvertRem;
         border-bottom: 1px solid #e0e0e0;
-
-        &:last-child {
-            border-bottom: none;
-        }
-    }
-
-
-    .advance-block .gift-advance-good:last-child {
-        border-bottom: none;
     }
 
     .advance-block:last-child .gift-advance-good:last-child {

@@ -111,6 +111,11 @@
     .price {
         font-size: 0.6rem;
         color: $cartRed;
+        display: inline;
+        .sale-price{
+            color: #b0b0b0;
+            text-decoration: line-through;
+        }
     }
 
     .count {

@@ -140,10 +140,11 @@
 
         > li {
             box-sizing: border-box;
-            height: 90rem / $pxConvertRem;
-            line-height: 90rem / $pxConvertRem;
+            height: 80rem / $pxConvertRem;
+            line-height: 80rem / $pxConvertRem;
             margin-bottom: 10rem / $pxConvertRem;
             padding: 0 20rem / $pxConvertRem;
+            background: #f1f1f1;
 
             &:last-child {
                 margin-bottom: 0;

@@ -185,7 +185,7 @@
             height: pxToRem(60px);
             color: #444;
             background: #efefef;
-            font-size: pxToRem(16px);
+            font-size: pxToRem(24px);
             line-height: 1;
             outline: 0;
             border: 0;

@@ -49,7 +49,7 @@
     .not-use {
         display: block;
         width: pxToRem(560px);
-        margin: pxToRem(30px) auto;
+        margin: pxToRem(30px) auto 0;
         text-align: center;
         font-size: pxToRem(32px);
         line-height: 2.5;
@@ -61,7 +61,7 @@
         position: relative;
         margin-top: pxToRem(30px);
         margin-bottom: pxToRem(30px);
-        font-size: pxToRem(14px);
+        font-size: pxToRem(28px);
         line-height: 2;
         color: #b0b0b0;
         text-align: center;

@@ -32,4 +32,10 @@
 			}
 		}
 	}
+}
+.deal_main{
+	margin: .5rem 3%;
+	font-size:1.2em;
+	widows: 94%;
+	overflow: hidden;
 }
\ No newline at end of file

@@ -41,10 +41,15 @@
                 </p>
             </div>
             <p class="row">
-                <span class="price">
-                    ¥{{price}}
-                </span>
-
+                    <p class="price">
+                        <span class="market-price">¥{{price}}</span>
+                        {{#if isAdvanceBuy}}
+                        <span class="sale-price">¥{{salesPrice}}</span>
+                        {{/if}}
+                        {{#if isGift}}
+                        <span class="sale-price">¥{{salesPrice}}</span>
+                        {{/if}}
+                    </p>
                 {{#if isVipPrice}}
                     <span class="vip">
                         VIP

@@ -640,16 +640,13 @@ class HomeController extends AbstractAction
      * 我的订单页面,获得nav导航条焦点。并且异步请求订单详情列表页（getOrders）
      *
      */
-
     public function ordersAction()
     {
         // 审判跳转登录页
         $this->auditJumpLogin();
 
-        $backUrl = Helpers::url('/home');
-
         $this->setTitle('我的订单');
-        $this->setNavHeader('我的订单', $backUrl);
+        $this->setNavHeader('我的订单', Helpers::url('/home') );
 
         $order = array();
         //获得type值,type:1=>全部,2=>待付款,3=>待发货,4=>待收货,5=>待评论
@@ -887,7 +884,7 @@ class HomeController extends AbstractAction
         $this->setTitle($caption);
         $this->setNavHeader($caption);
 
-        $this->_view->display('helpDetail', array(
+        $this->_view->display('help-detail', array(
             'iHelp' => Home\HelpModel::serviceDetail($code),
         ));
     }

@@ -556,8 +556,8 @@ class CartModel
                     $notAvailableRes = self::searchCoupon($uid, $val['couponCode']);
                     // 处理可用的优惠券
                     if ($val['isValidity'] === 'N' || (isset($notAvailableRes['code']) && $notAvailableRes['code'] !== 200)) {
-//                        $val['notAvailable'] = true;
-                        continue;
+                        $val['notAvailable'] = true;
+                        // continue;
                     }
                     $result[] = $val;
                 }

@@ -71,7 +71,7 @@ class HomeModel
 
     /**
      * 设置选择的频道保存到浏览器COOKIE
-     * (已废弃，改成ＪＳ设置)
+     * (已废弃，改成JS设置)
      * 
      * @param string $cookie
      * @return void

@@ -289,7 +289,6 @@ class IndexController extends AbstractAction
             $this->go(Helpers::url('/cart/index/index'));
         }
 
-
         $cookieData = $this->getCookie('order-info', null);
         $uid = $this->getUid(true);
         $data = array(
@@ -457,8 +456,8 @@ class IndexController extends AbstractAction
             $result = CartModel::addToCart($productSku, $buyNumber, $goodsType, $isEdit, $promotionId, $uid, $shoppingKey);
 
             // 设置加入购物车凭证到客户端浏览器
-            if (!$shoppingKey && isset($result['data']['shopping_key'])) {
-                $this->setCookie('_Spk', $result['data']['shopping_key']);
+            if (empty($shoppingKey) && isset($result['data']['shopping_key'])) {
+                $this->setCookie('_SPK', $result['data']['shopping_key'], time() + 86400 * 360);
             }
         }
 

@@ -17,6 +17,10 @@ class LoginController extends AbstractAction
      */
     public function indexAction()
     {
+        // 清除客户端
+        $this->setCookie('_UID', '');
+        $this->setCookie('_TOKEN', '');
+
         $refer = $this->get('refer');
         if (!empty($refer)) {
             $this->setCookie('refer', $refer);
@@ -61,7 +65,6 @@ class LoginController extends AbstractAction
         $data['isPassportPage'] = true; // 模板中模块标识
         $data['areaCode'] = '+86'; // 默认区号
         $data['countrys'] = RegData::getAreasData(); // 地区信息列表
-        
         // 渲染模板
         $this->_view->display('international', $data);
     }
@@ -74,6 +77,7 @@ class LoginController extends AbstractAction
         // 清除客户端
         $this->setCookie('_UID', '');
         $this->setCookie('_TOKEN', '');
+        $this->setCookie('_SPK', '');
         // 清除服务端会话
         $this->setSession('_TOKEN', '');
 
@@ -148,7 +152,7 @@ class LoginController extends AbstractAction
     public function alipayAction()
     {
         $this->setSession('_TOKEN', '');
-        
+
         Factory::create('alipay')->getAuthorizeUrl();
 
         exit();
@@ -160,7 +164,7 @@ class LoginController extends AbstractAction
     public function qqAction()
     {
         $this->setSession('_TOKEN', '');
-        
+
         Factory::create('qqconnect')->getAuthorizeUrl();
 
         exit();
@@ -172,7 +176,7 @@ class LoginController extends AbstractAction
     public function sinaAction()
     {
         $this->setSession('_TOKEN', '');
-        
+
         $this->go(Factory::create('sinaweibo')->getAuthorizeUrl());
     }