fe / YOHOBUYWAP · Commits

15 Oct, 2015

19 commits

完善首页以及频道页的模板，添加分类数据处理类，初步完成分类模块
393fadca

by Rock Zhang
2015-10-15 16:40:43 +0800
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
162e49c3
```
Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/Girls.php
```
by Rock Zhang
2015-10-15 15:50:35 +0800
Browse Files
category style bug
d1a2b989

by xuqi
2015-10-15 15:48:46 +0800
Browse Files
ps lazyload
a8cd7794

by xuqi
2015-10-15 15:48:21 +0800
Browse Files
fix height if ps list row
8805f68c

by xuqi
2015-10-15 15:35:57 +0800
Browse Files
info prise & collect
eb98171f

by xuqi
2015-10-15 14:48:58 +0800
Browse Files
update files
43a39991

by 梁志锋
2015-10-15 14:40:38 +0800
Browse Files
update files
cc6f5d48

by 梁志锋
2015-10-15 14:33:28 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
7c42ce11

by xuqi
2015-10-15 14:02:15 +0800
Browse Files
info icon change
a29b195c

by xuqi
2015-10-15 14:01:57 +0800
Browse Files
guang info author
5f20a822

by xuqi
2015-10-15 13:51:01 +0800
Browse Files
update files
0ca3501e

by 梁志锋
2015-10-15 11:54:51 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
0e4ca9d6

by Rock Zhang
2015-10-15 11:37:55 +0800
Browse Files
修改女首有关的一些模板”
8a5ca8cb

by Rock Zhang
2015-10-15 11:37:50 +0800
Browse Directory »
update files
c18dceea

by 梁志锋
2015-10-15 10:44:47 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c010027b

by xuqi
2015-10-15 10:29:35 +0800
Browse Files
guang js entry
432f3631

by xuqi
2015-10-15 10:29:21 +0800
Browse Files
update files
8058ae61

by 梁志锋
2015-10-15 10:21:39 +0800
Browse Files
update files
165ef30e

by 梁志锋
2015-10-15 10:20:42 +0800
Browse Files

14 Oct, 2015

21 commits

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

by 梁志锋
2015-10-14 19:25:25 +0800
Browse Files
update files
9a7c47e5

by 梁志锋
2015-10-14 19:25:09 +0800
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
094c0f6e
```
Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/Girls.php
```
by Rock Zhang
2015-10-14 18:37:16 +0800
Browse Files
去除多余代码，侧边栏接口去除
b471f5bb

by Rock Zhang
2015-10-14 18:36:33 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
9f2be060

by xuqi
2015-10-14 18:32:04 +0800
Browse Files
Merge branch 'feature/category' into develop
73e7caf5

by xuqi
2015-10-14 18:31:48 +0800
Browse Files
品类
59f3d275

by xuqi
2015-10-14 18:31:31 +0800
Browse Files
update files
06b9afd7

by 梁志锋
2015-10-14 18:16:42 +0800
Browse Files
update files
644887fc

by 梁志锋
2015-10-14 17:50:23 +0800
Browse Files
do add page cache and data cache master slave mode
7b9ad6f9

by hf
2015-10-14 17:46:02 +0800
Browse Files
do add page cache and data cache master slave mode
f666a974

by hf
2015-10-14 17:45:03 +0800
Browse Files
do add page cache and data cache master slave mode
d9c97765

by hf
2015-10-14 17:44:31 +0800
Browse Files
update files
f2e96982

by 梁志锋
2015-10-14 16:51:23 +0800
Browse Files
update files
a245a9f5

by 梁志锋
2015-10-14 16:47:00 +0800
Browse Files
还原RecomData文件中的mayLike接口
3ceb824c

by Rock Zhang
2015-10-14 16:31:00 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
8e73defd
```
Conflicts:
	template/m.yohobuy.com/partials/common/good_info.phtml
	yohobuy/m.yohobuy.com/application/controllers/Girls.php
```
by Rock Zhang
2015-10-14 16:28:31 +0800
Browse Files
修改首页以及各频道页的模板，修改楼层处理类
45bcb128

by Rock Zhang
2015-10-14 16:25:09 +0800
Browse Directory »
slideDown slideUp -> hide show
35195ab6

by xuqi
2015-10-14 15:54:37 +0800
Browse Files
Merge branch 'feature/guang' into develop
b05c2fc2

by xuqi
2015-10-14 15:45:37 +0800
Browse Directory »
guang detail
90f64f4a

by xuqi
2015-10-14 15:42:07 +0800
Browse Directory »
update
bef626e5

by 梁志锋
2015-10-14 13:52:04 +0800
Browse Files