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

@@ -22,24 +22,11 @@ var navHammer,
     freebieHammer,
     freebieHammer,
     switchChose = false;
     switchChose = false;
 
 
-//require('./good');
-
-function isCookiesEnabled() {
-    var cookieEnabled = (navigator.cookieEnabled) ? true : false;
-
-    if (typeof navigator.cookieEnabled === 'undefined' && !cookieEnabled) {
-        document.cookie = 'testcookie';
-        cookieEnabled = (document.cookie.indexOf('testcookie') !== -1) ? true : false;
-    }
-
-    return (cookieEnabled);
-}
-
 
 
 function needLoadRecommandForYou() {
 function needLoadRecommandForYou() {
-    return isCookiesEnabled() ?
-            $('.shopping-cart-good').length <= 0 && window.cookie('yoho-cart-refreshByDelete') !== 'true' :
-            $('.shopping-cart-good').length <= 0;
+    return window.isCookiesEnabled() ?
+            $('.cart-goods').length <= 0 && window.cookie('_yoho-cart-refreshByDelete') !== 'true' :
+            $('.cart-goods').length <= 0;
 }
 }
 
 
 if (needLoadRecommandForYou()) {
 if (needLoadRecommandForYou()) {
@@ -48,7 +35,7 @@ if (needLoadRecommandForYou()) {
     require('./good');
     require('./good');
 }
 }
 
 
-window.setCookie('yoho-cart-refreshByDelete', false);
+window.setCookie('_yoho-cart-refreshByDelete', false);
 
 
 ellipsis.init();
 ellipsis.init();
 
 

@@ -108,7 +108,7 @@ $('.icon-del').on('touchstart', function(e) {
                 });
                 });
                 orderInfo('couponCode', null);
                 orderInfo('couponCode', null);
                 orderInfo('couponName', 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 {
                 tip.show(data.message);
                 tip.show(data.message);

@@ -58,6 +58,17 @@ function setCookie(name, value, options) {
     }
     }
 }
 }
 
 
+function isCookiesEnabled() {
+    var cookieEnabled = (navigator.cookieEnabled) ? true : false;
+
+    if (typeof navigator.cookieEnabled === 'undefined' && !cookieEnabled) {
+        document.cookie = 'testcookie';
+        cookieEnabled = (document.cookie.indexOf('testcookie') !== -1) ? true : false;
+    }
+
+    return (cookieEnabled);
+}
+
 function getUser() {
 function getUser() {
     var c = cookie('_UID'),
     var c = cookie('_UID'),
         user;
         user;
@@ -276,6 +287,8 @@ window.cookie = cookie;
 
 
 window.setCookie = setCookie;
 window.setCookie = setCookie;
 
 
+window.isCookiesEnabled = isCookiesEnabled;
+
 window.getUser = getUser;
 window.getUser = getUser;
 
 
 window.getUid = getUid;
 window.getUid = getUid;

@@ -83,5 +83,8 @@ exports.showDialog = function(data, callback, callbackForLeft) {
         } else if ($(event.target).hasClass('dialog-right-btn')) {
         } else if ($(event.target).hasClass('dialog-right-btn')) {
             callback();
             callback();
         }
         }
+
+        event.preventDefault();
+        event.srcEvent.stopPropagation();
     });
     });
 };
 };