wangshusheng / YOHOBUYPC · Commits

05 Jan, 2016

20 commits

Merge branch 'feature/wap323' of http://git.dev.yoho.cn/web/yohobuy into feature/consultUpdate
4f5c2faf

by biao
2016-01-05 18:06:45 +0800
Browse Files
添加未登录用户点击咨询赞或者有用时的跳转登陆页数据
121e44c0

by Rock Zhang
2016-01-05 17:58:00 +0800
Browse Files
Merge branch 'feature/wap323' of http://git.dev.yoho.cn/web/yohobuy into feature/consultUpdate
80e0cfb0

by biao
2016-01-05 17:06:10 +0800
Browse Files
Merge branch 'feature/wap323' into 'feature/wap323' ...
594d0f63
```
1.有货币页面改造 2.品牌一览页面增加顶部导航。 code review by Zhang Zhen

See merge request !90
```
by Rock Zhang
2016-01-05 15:49:23 +0800
Browse Files
更新加载may-like.js的方法
272653a5

by biao
2016-01-05 15:40:15 +0800
Browse Files
有货币页面改造
ecad6af7

by biao
2016-01-05 15:33:17 +0800
Browse Files
更新有货币页面模版
9adb297b

by biao
2016-01-05 15:13:03 +0800
Browse Files
roll back the home.js to sync to develop branch
c2d7d347

by biao
2016-01-05 15:02:59 +0800
Browse Files
更新频道选择页顶部导航
14908920

by biao
2016-01-05 15:00:06 +0800
Browse Files
更新频道选择页顶部导航
e1bf1ba2

by biao
2016-01-05 14:59:48 +0800
Browse Files
Merge branch 'feature/wap323' of http://git.dev.yoho.cn/web/yohobuy into feature/wap323
82095c65

by biao
2016-01-05 13:17:50 +0800
Browse Files
加入有货币页面必要字段。
8eaf1bf9

by biao
2016-01-05 13:17:42 +0800
Browse Files
去除品牌一览页面调试信息 ...
28d9d19e
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-01-05 13:15:22 +0800
Browse Files
添加品牌一览页面顶部导航的数据 ...
3ffa8490
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-01-05 13:11:00 +0800
Browse Files
添加商品详情页用户咨询点赞以及有用接口 ...
91d99f1d
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-01-05 11:46:23 +0800
Browse Files
忽略一些编辑器生成的file ...
3e874f2e
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-01-05 10:19:44 +0800
Browse File »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/wap323
ac859d50

by Rock Zhang
2016-01-05 09:56:40 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
4cc6ce2e

by lore-w
2016-01-05 09:50:19 +0800
Browse Files
商品列表bug修复 code review by liuyue
b029130f

by lore-w
2016-01-05 09:49:50 +0800
Browse Files
update the background color of gender nav
3ad454ec

by biao
2016-01-05 09:43:01 +0800
Browse Files

04 Jan, 2016

20 commits

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

by yangyang
2016-01-04 19:05:40 +0800
Browse Files
修改每页显示个数为59
bd968043

by yangyang
2016-01-04 19:03:45 +0800
Browse Files
Merge branch 'feature/web-list' of git.dev.yoho.cn:web/yohobuy into feature/web-list
685b2971

by 周少峰
2016-01-04 18:59:01 +0800
Browse Files
list_sale 默认搜素参数设置
03723999

by 周少峰
2016-01-04 18:56:33 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list
f861d663

by 周少峰
2016-01-04 17:04:01 +0800
Browse Files
Merge branch 'feature/web-list' of http://git.dev.yoho.cn/web/yohobuy into feature/web-list
29189382

by yangyang
2016-01-04 16:26:15 +0800
Browse Files
修复小bug
e1ea3629

by yangyang
2016-01-04 16:25:56 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
99cd9b17

by wangqing
2016-01-04 16:21:09 +0800
Browse Files
增加登录状态
1a6c61ec

by wangqing
2016-01-04 16:19:59 +0800
Browse Files
品牌导航修改
c5a34e3f

by 周少峰
2016-01-04 15:56:43 +0800
Browse Files
注释提示错误
4288bf2b

by 周少峰
2016-01-04 15:47:48 +0800
Browse Files
Merge branch 'feature/web-list' of git.dev.yoho.cn:web/yohobuy into feature/web-list
cdb5b594

by 周少峰
2016-01-04 15:43:31 +0800
Browse Files
取消注释
acdcaff8

by yangyang
2016-01-04 15:46:34 +0800
Browse Files
helpSearch brandName键名做判断
3084380a

by 周少峰
2016-01-04 15:43:08 +0800
Browse Files
Merge branch 'feature/web-list' of http://git.dev.yoho.cn/web/yohobuy into feature/web-list ...
6e3ffe71
```
Conflicts:
	yohobuy/www.yohobuy.com/application/models/Product/Search.php
```
by yangyang
2016-01-04 15:30:07 +0800
Browse Files
修改Brands.php
f3f7d499

by yangyang
2016-01-04 15:28:27 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list
91a03a06

by 周少峰
2016-01-04 15:28:20 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
2735c04d

by lore-w
2016-01-04 15:27:29 +0800
Browse Files
商品列表bug修改 code review by liuyue
4acd4aa4

by lore-w
2016-01-04 15:27:04 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list
99b23e2a

by 周少峰
2016-01-04 15:18:08 +0800
Browse Files