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

@@ -10,8 +10,9 @@ var $ = require('jquery'),
     lazyLoad = require('yoho.lazyload');
     lazyLoad = require('yoho.lazyload');
 
 
 var dialog = require('../me/dialog'),
 var dialog = require('../me/dialog'),
-    tip = require('../plugin/tip'),
-    orderInfo = require('./order-info').orderInfo;
+    tip = require('../plugin/tip');
+
+// orderInfo = require('./order-info').orderInfo;
 
 
 var $selectAllBtn = $('.balance .checkbox'),
 var $selectAllBtn = $('.balance .checkbox'),
     requesting = false;
     requesting = false;
@@ -106,8 +107,9 @@ $('.icon-del').on('touchstart', function(e) {
                     autoHide: true,
                     autoHide: true,
                     fast: true
                     fast: true
                 });
                 });
-                orderInfo('couponCode', null);
-                orderInfo('couponName', null);
+
+                // orderInfo('couponCode', null);
+                // orderInfo('couponName', null);
                 window.setCookie('_yoho-cart-refreshByDelete', true);
                 window.setCookie('_yoho-cart-refreshByDelete', true);
                 window.location.href = '/cart/index/index?cartType=' + $('#cartType').val();
                 window.location.href = '/cart/index/index?cartType=' + $('#cartType').val();
             } else {
             } else {

@@ -40,6 +40,12 @@ if ($couponUse.data('name') !== orderInfo('couponName')) {
     orderInfo('couponName', null);
     orderInfo('couponName', null);
 }
 }
 
 
+// 来自购物车的链接默认不使用优惠券
+if (document.referrer && document.referrer.indexOf('/cart/index/index') !== -1) {
+    orderInfo('couponCode', null);
+    orderInfo('couponName', null);
+}
+
 orderInfo('cartType', queryString.cartType || queryString.carttype || 'ordinary');
 orderInfo('cartType', queryString.cartType || queryString.carttype || 'ordinary');
 
 
 function dispacthTapEvt(e) {
 function dispacthTapEvt(e) {
@@ -120,6 +126,9 @@ function orderCompute() {
     });
     });
 }
 }
 
 
+// 进入页面计算一次价格
+orderCompute();
+
 function submitOrder() {
 function submitOrder() {
     var invoiceText = $invoice.find('[name="invoice-title"]').val() || orderInfo('invoiceText'),
     var invoiceText = $invoice.find('[name="invoice-title"]').val() || orderInfo('invoiceText'),
         msg = $('#msg').find('input').val() || orderInfo('msg');
         msg = $('#msg').find('input').val() || orderInfo('msg');

@@ -30,9 +30,9 @@ function init() {
 // info 必须是 JSON 字符串
 // info 必须是 JSON 字符串
 try {
 try {
     info = JSON.parse(info);
     info = JSON.parse(info);
-    
+
     // 2015/12/31 hf: fixes bug to 购物车页面调用该JS, 会导致有YOHO币，值却没有传给服务端. 因此需要再设置一下
     // 2015/12/31 hf: fixes bug to 购物车页面调用该JS, 会导致有YOHO币，值却没有传给服务端. 因此需要再设置一下
-    info['yohoCoin'] = $('.coin').data('yoho-coin') || 0;
+    // info.yohoCoin = $('.coin').data('yoho-coin') || 0;
 } catch (e) {
 } catch (e) {
     init();
     init();
 }
 }

@@ -158,15 +158,14 @@ function getCouponHandle(coupons) {
                     couponCode: couponCode
                     couponCode: couponCode
                 }
                 }
             }).then(function(res) {
             }).then(function(res) {
-                if (res.message) {
-                    tip.show(res.message);
-                }
                 if (res.code === 200) {
                 if (res.code === 200) {
 
 
                     //tip.show('优惠券可用');
                     //tip.show('优惠券可用');
                     orderInfo('couponCode', res.data.coupon_code);
                     orderInfo('couponCode', res.data.coupon_code);
                     orderInfo('couponName', res.data.coupon_title);
                     orderInfo('couponName', res.data.coupon_title);
                     window.location.href = '/cart/index/orderEnsure';
                     window.location.href = '/cart/index/orderEnsure';
+                } else if (res.message) {
+                    tip.show(res.message);
                 }
                 }
             }).fail(function() {
             }).fail(function() {
                 tip.show('网络错误');
                 tip.show('网络错误');

@@ -90,8 +90,8 @@ function loadData($parent, url, page) {
                 $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
                 $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
             } else if (data === 'end') {
             } else if (data === 'end') {
                 $parent.closest('.fav-type').find('.fav-load-background')
                 $parent.closest('.fav-type').find('.fav-load-background')
-                    .removeClass('fav-load-background').html('没有更多了');
-                
+                    .removeClass('fav-load-background').html('没有更多了');
+
                 // hf: fixes bug to 修改没有数据还调接口,加载错误页面问题
                 // hf: fixes bug to 修改没有数据还调接口,加载错误页面问题
                 brandLockId = true;
                 brandLockId = true;
                 lockId = true;
                 lockId = true;
@@ -241,5 +241,7 @@ $(window).scroll(scrollHandler);
 $(document).on('touchend', '.swiper-header', function() {
 $(document).on('touchend', '.swiper-header', function() {
     var url = $(this).find('.fav-more').attr('href');
     var url = $(this).find('.fav-more').attr('href');
 
 
-    window.location.href = url;
+    if (url) {
+        window.location.href = url;
+    }
 });
 });