Authored by ccbikai

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

... ... @@ -121,17 +121,17 @@ function rePosFooter() {
//未登录
$op.prepend(
'<a href="http://m.yohobuy.com/signin.html">登录</a>' +
'<a href="/signin.html">登录</a>' +
'<span class="sep-line">|</span>' +
'<a href="http://m.yohobuy.com/reg.html">注册</a>'
'<a href="/reg.html">注册</a>'
);
} else {
//已登录
$op.prepend(
'Hi,' +
'<a class="user-name" href="http://m.yohobuy.com/home?tmp=' + Math.random() + '">' + user[0] + '</a>' +
'<a href="http://m.yohobuy.com/passport/signout/index?token=' + user[3] + '">退出</a>'
'<a class="user-name" href="/home?tmp=' + Math.random() + '">' + user[0] + '</a>' +
'<a href="/passport/signout/index?token=' + user[3] + '">退出</a>'
);
}
... ...
... ... @@ -220,6 +220,8 @@ function search(opt) {
}
require('./suspend-cart'); //悬浮购物车
$.ajax({
type: 'GET',
url: '/search/filter',
... ...
... ... @@ -61,6 +61,8 @@ var $listNav = $('#list-nav'),
navHammer,
searching;
require('./suspend-cart'); //悬浮购物车
if ($('.swiper-container .swiper-slide').length > 1) {
swiper = new Swiper('.swiper-container', {
lazyLoading: true,
... ...
... ... @@ -71,6 +71,8 @@ var $listNav = $('#list-nav'),
navHammer,
searching;
require('./suspend-cart'); //悬浮购物车
$('#today a').text(month + '月' + date + '号');
if ($('.swiper-container .swiper-slide').length > 1) {
... ...
/**
* 悬浮购物车
* @author: xuqi<qi.xu@yoho.cn>
* @date: 2015/11/1
*/
var $ = require('jquery');
var $cart = $('#suspend-cart');
$.ajax({
type: 'GET',
url: '/cart/index/count',
success: function(data) {
if (data.code === 200) {
$cart.find('.cart-count').html(data.data.cart_good_count).removeClass('hide');
}
}
});
\ No newline at end of file
... ...