Merge branch 'fix/issue' into 'develop'

优化购物车商品删空后的页面颜色。

See merge request !77

@@ -10,11 +10,13 @@ var $ = require('jquery'),
 
 
 var chosePanel = require('./chose-panel'),
 var chosePanel = require('./chose-panel'),
     dialog = require('../me/dialog'),
     dialog = require('../me/dialog'),
+    loading = require('../plugin/loading'),
     tip = require('../plugin/tip');
     tip = require('../plugin/tip');
 
 
 var $cartContent = $('.cart-content'),
 var $cartContent = $('.cart-content'),
     cartType = $('#cartType').val(),
     cartType = $('#cartType').val(),
     $cartNav = $('.cart-nav'),
     $cartNav = $('.cart-nav'),
+    $cartPage = $('.shopping-cart-page'),
     hasShowCartPresellTip = false;
     hasShowCartPresellTip = false;
 
 
 var navHammer,
 var navHammer,
@@ -22,19 +24,30 @@ var navHammer,
     freebieHammer,
     freebieHammer,
     switchChose = false;
     switchChose = false;
 
 
+var isRefreshByDelete = window.cookie('_yoho-cart-refreshByDelete') === 'true' ? true : false;
+
+
+loading.showLoadingMask();
 
 
 function needLoadRecommandForYou() {
 function needLoadRecommandForYou() {
     return window.isCookiesEnabled() ?
     return window.isCookiesEnabled() ?
-            $('.cart-goods').length <= 0 && window.cookie('_yoho-cart-refreshByDelete') !== 'true' :
+            $('.cart-goods').length <= 0 && !isRefreshByDelete :
             $('.cart-goods').length <= 0;
             $('.cart-goods').length <= 0;
 }
 }
 
 
+
 if (needLoadRecommandForYou()) {
 if (needLoadRecommandForYou()) {
     require('../product/recommend-for-you');
     require('../product/recommend-for-you');
 } else {
 } else {
+    if (isRefreshByDelete) {
+        $('body').css('background-color', '#f0f0f0');
+    }
     require('./good');
     require('./good');
 }
 }
 
 
+$cartPage.css('display', 'block');
+loading.hideLoadingMask();
+
 window.setCookie('_yoho-cart-refreshByDelete', false);
 window.setCookie('_yoho-cart-refreshByDelete', false);
 
 
 ellipsis.init();
 ellipsis.init();

@@ -8,6 +8,7 @@
     margin-bottom: 120rem / $pxConvertRem;
     margin-bottom: 120rem / $pxConvertRem;
     overflow-x: hidden;
     overflow-x: hidden;
     background: #f0f0f0;
     background: #f0f0f0;
+    display: none;
 
 
     .yoho-tip {
     .yoho-tip {
         z-index: 4;
         z-index: 4;