Authored by 郝肖肖

冲突

This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
... ... @@ -85,7 +85,7 @@ $shopCollect.on('click', function() {
colloectAction();
});
if (window.cookie('needColloect') * 1 === 1) {
if (window.cookie('needColloect') * 1 === 1 && window.getUid()) {
colloectAction();
window.setCookie('needColloect', '', {
path: '/',
... ...