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

@@ -1160,7 +1160,7 @@ function actionTipPic() {
         }
         }
     });
     });
     logolink = $('.first-nav-list .cur').find('a').attr('href');
     logolink = $('.first-nav-list .cur').find('a').attr('href');
-    $('.main-link').attr('href', link);
+    $('.main-link').attr('href', logolink);
 }
 }
 
 
 
 

@@ -10,23 +10,11 @@ var $body = $('body');
 
 
 require('./footer');
 require('./footer');
 
 
-
-
 function cookie(name) {
 function cookie(name) {
-    var cookies = document.cookie,
-        cookieVal,
-        offset;
-
-    if (document.cookie && document.cookie !== '') {
-        offset = cookies.indexOf(name + '=');
-        if (offset > -1) {
-            offset += name.length + 1;
-
-            cookieVal = decodeURIComponent($.trim(cookies.substring(offset, cookies.indexOf(';', offset))));
-        }
-    }
+    var re = new RegExp(name + '=([^;$]*)', 'i'),
+        matchPattern = '$1';
 
 
-    return cookieVal;
+    return re.test(decodeURIComponent(document.cookie)) ? RegExp[matchPattern] : '';
 }
 }
 
 
 function setCookie(name, value, options) {
 function setCookie(name, value, options) {