fe / YOHOBUYPC · Commits

02 Dec, 2015

33 commits

Merge branch 'feature/web' of git.dev.yoho.cn:web/yohobuy into feature/web ...
a2098f3b
```
Conflicts:
	web-static/package.json
```
by lore-w
2015-12-02 18:38:21 +0800
Browse Files
商品鼠标移入效果
95203e88

by lore-w
2015-12-02 18:37:09 +0800
Browse Files
修改滚动加载插件
2729cbdd

by weiqingting
2015-12-02 18:06:34 +0800
Browse Files
修改滚动加载插件
eb1e1dc6

by weiqingting
2015-12-02 18:05:44 +0800
Browse Files
更新
63e80a72

by weiqingting
2015-12-02 17:39:30 +0800
Browse Files
Merge remote-tracking branch 'refs/remotes/origin/feature/web' into feature/web
7b55c694

by weiqingting
2015-12-02 17:37:22 +0800
Browse Files
细节修改
674598c6

by weiqingting
2015-12-02 17:36:06 +0800
Browse Files
Merge branch 'feature/web' of http://git.dev.yoho.cn/web/yohobuy into feature/web
bf966c3f

by unknown
2015-12-02 17:35:16 +0800
Browse Files
图片懒加载
2741c404

by unknown
2015-12-02 17:35:07 +0800
Browse Files
修改css
7bb0d1f3

by weiqingting
2015-12-02 16:53:57 +0800
Browse Files
js依赖更改
331b0b76

by unknown
2015-12-02 16:46:51 +0800
Browse Files
Merge branch 'feature/web' of http://git.dev.yoho.cn/web/yohobuy into feature/web
57dfd2fb

by unknown
2015-12-02 16:45:45 +0800
Browse Files
js依赖更改
d45141c3

by unknown
2015-12-02 16:45:33 +0800
Browse Files
修改控制器模块顺序可以变化
9be7dfc3

by weiqingting
2015-12-02 16:36:17 +0800
Browse Files
单品 hot 楼层添加
8a3ac0d4

by weiqingting
2015-12-02 16:14:22 +0800
Browse Files
Merge branch 'feature/web' of http://git.dev.yoho.cn/web/yohobuy into feature/web
d274e201

by unknown
2015-12-02 15:48:08 +0800
Browse Files
男首数据结构、模板修改
7360d65d

by unknown
2015-12-02 15:48:01 +0800
Browse Files
修改公共部分的类名
436070c6

by wangqing
2015-12-02 15:27:09 +0800
Browse Files
Merge branch 'feature/web' of http://git.dev.yoho.cn/web/yohobuy into feature/web
4a64283e

by wangqing
2015-12-02 15:26:27 +0800
Browse Files
头部部分函数
201049da

by wangqing
2015-12-02 15:25:36 +0800
Browse Files
男首数据文档
7fb9ac27

by unknown
2015-12-02 15:24:05 +0800
Browse Files
Merge branch 'feature/web' of http://git.dev.yoho.cn/web/yohobuy into feature/web
d4b22b83

by unknown
2015-12-02 15:23:21 +0800
Browse Files
five or six per line of product list
9d7ee9f5

by xuqi
2015-12-02 15:13:54 +0800
Browse Files
Merge branch 'feature/web' of http://git.dev.yoho.cn/web/yohobuy into feature/web
47dd14bb

by xuqi
2015-12-02 15:03:21 +0800
Browse Files
Merge branch 'feature/web' of http://git.dev.yoho.cn/web/yohobuy into feature/web
4b2cb971

by unknown
2015-12-02 14:50:47 +0800
Browse Files
男首数据文档
3486c807

by unknown
2015-12-02 14:50:37 +0800
Browse Files
php boy 冲突修改
24b7a1a7

by weiqingting
2015-12-02 14:46:38 +0800
Browse Files
滚动加载
221c3b10

by weiqingting
2015-12-02 14:40:04 +0800
Browse Files
Merge branch 'feature/web' of http://git.dev.yoho.cn/web/yohobuy into feature/web
e1e2a388

by xuqi
2015-12-02 14:32:20 +0800
Browse Files
代码审查
1cf3ebe4

by weiqingting
2015-12-02 14:20:41 +0800
Browse Files
男首品牌优选js
7fd5a233

by unknown
2015-12-02 14:17:03 +0800
Browse Files
男装添加滚动无限功能
d6598687

by weiqingting
2015-12-02 14:16:44 +0800
Browse Files
yoho page style
4e2a0ca9

by xuqi
2015-12-02 14:06:01 +0800
Browse Files

01 Dec, 2015

7 commits

Merge branch 'feature/web' of http://git.dev.yoho.cn/web/yohobuy into feature/web
9c0cdaff

by unknown
2015-12-01 17:46:10 +0800
Browse Files
男首
92426acc

by unknown
2015-12-01 17:46:03 +0800
Browse Files
合并男首冲突
7f540f7b

by wangqing
2015-12-01 17:42:43 +0800
Browse Files
增加头部和尾部
79ddbafd

by wangqing
2015-12-01 17:31:16 +0800
Browse Files
Merge branch 'feature/web' of http://git.dev.yoho.cn/web/yohobuy into feature/web
9e2ec6fe

by unknown
2015-12-01 16:54:15 +0800
Browse Files
slide2 modify
4db5a608

by unknown
2015-12-01 16:54:06 +0800
Browse Files
Merge branch 'feature/web' of git.dev.yoho.cn:web/yohobuy into feature/web ...
623ef3c9
```
Conflicts:
	web-static/js/product/list.js
	web-static/sass/product/_index.scss
```
by lore-w
2015-12-01 16:46:11 +0800
Browse Files