wangshusheng / YOHOBUYPC · Commits

15 Jan, 2016

3 commits

搜索分类调整、条件分类调整，选中条件高亮，全部折扣，排序按钮调整
11cb4c00

by 周少峰
2016-01-15 14:40:33 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list
c425373a

by 周少峰
2016-01-15 10:30:35 +0800
Browse Files
Merge branch 'hotfix/yohocoinuse' into develop ...
f8bcb412
```
Conflicts:
	static/js/cart/order-ensure.js
```
by Rock Zhang
2016-01-15 10:14:32 +0800
Browse Files

14 Jan, 2016

37 commits

修复bug
3232b1b9

by 周少峰
2016-01-14 18:34:36 +0800
Browse Files
Merge branch 'hotfix/yohocoinuse' of git.dev.yoho.cn:web/yohobuy into hotfix/yohocoinuse
b86a7088

by Rock Zhang
2016-01-14 18:21:58 +0800
Browse Files
修复结算页面cookie中的cartType记录与url中的cartType不同步导致数据错误的bug ...
9545ce72
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-01-14 18:20:59 +0800
Browse Files
发票选择穿透问题修改
964f59f0

by 毕凯
2016-01-14 18:18:41 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
338a542a

by xuqi
2016-01-14 18:08:15 +0800
Browse Files
multi btn ok dis remove.Review by:@xuqi
8175c8fc

by xuqi
2016-01-14 18:07:51 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
7af322ac

by 毕凯
2016-01-14 18:01:28 +0800
Browse Files
Merge branch 'feature/web/search' into develop
18349534

by 毕凯
2016-01-14 18:01:21 +0800
Browse Files
按钮不显示外边的蓝圈
ae89f9a7

by 毕凯
2016-01-14 18:01:12 +0800
Browse Files
按钮不显示外边的蓝圈
d7f79551

by 毕凯
2016-01-14 18:01:00 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
99a40557

by whb
2016-01-14 17:50:11 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e6f944f5

by unknown
2016-01-14 17:47:26 +0800
Browse Files
hotrank js @review by 王成龙
ed59d019

by unknown
2016-01-14 17:47:10 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
9b8656a1

by whb
2016-01-14 17:45:41 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
8a7ea624

by 毕凯
2016-01-14 17:45:20 +0800
Browse Files
商品列表鼠标悬浮获取到商品信息后显示第一张图片
7ad3ef12

by 毕凯
2016-01-14 17:45:13 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4cca3b86

by whb
2016-01-14 17:44:28 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
25a34ac2

by Rock Zhang
2016-01-14 17:41:35 +0800
Browse Files
修复结算页面cokie中的cartType记录与url中的cartType不同步导致数据错误的bug ...
669eafd5
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-01-14 17:40:39 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c1e46053

by whb
2016-01-14 17:38:15 +0800
Browse Files
merge feature wap323 review by zhaobiao
f79f8d68

by 梁志锋
2016-01-14 17:37:31 +0800
Browse Files
merge feature wap323 review by zhaobiao
6336fc39

by 梁志锋
2016-01-14 17:33:01 +0800
Browse Files
merge feature wap323 review by zhaobiao
4abf20d0

by 梁志锋
2016-01-14 17:31:56 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
27f04c7b

by lore-w
2016-01-14 17:26:32 +0800
Browse Files
index，css
08287ddc

by whb
2016-01-14 17:26:01 +0800
Browse Files
注册联调、字段修改 code review by liuyue
be378c40

by lore-w
2016-01-14 17:25:35 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
1f06035b

by whb
2016-01-14 17:13:20 +0800
Browse Files
Merge branch 'beta' into develop ...
c8b0fda9
```
Conflicts:
	static/js/cart/order-ensure.js
```
by Rock Zhang
2016-01-14 17:06:51 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4e554b88

by 梁志锋
2016-01-14 16:58:00 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy.git into develop
a48feb52

by whb
2016-01-14 16:45:28 +0800
Browse Files
Merge branch 'feature/web-list' of http://git.dev.yoho.cn/web/yohobuy into feature/web-list
10c35ed3

by yangyang
2016-01-14 16:19:00 +0800
Browse Files
完成new页面
f8570558

by yangyang
2016-01-14 16:17:21 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list
5899d00a

by 周少峰
2016-01-14 16:04:13 +0800
Browse Files
全部折扣重复
4c25a2b3

by 周少峰
2016-01-14 16:02:21 +0800
Browse Files
更新到201501141557静态资源
73d15daa

by Rock Zhang
2016-01-14 15:57:11 +0800
Browse Files
修改启动
e29f8398

by whb
2016-01-14 15:56:16 +0800
Browse Files
Merge branch 'hotfix/yohocoinuse' into beta ...
f8951f84
```
Conflicts:
	static/js/cart/cart.js
	static/js/cart/order-info.js
```
by Rock Zhang
2016-01-14 15:51:26 +0800
Browse Files