fe / YOHOBUYPC · Commits

13 Jan, 2016

12 commits

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

by 梁志锋
2016-01-13 15:09:48 +0800
Browse Files
修复结算页切换运送方式时YOHO币会显示错乱的bug；修复使用免邮券不显示的bug ...
bc8fc6e6
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-01-13 14:30:25 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into beta
6eb32ca7

by 梁志锋
2016-01-13 13:34:36 +0800
Browse Files
list & new-sale template.
78f45e92

by xuqi
2016-01-13 13:28:50 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/web-list
58d4d312

by yangyang
2016-01-13 11:40:54 +0800
Browse Files
删除不需要的模板
07f86f04

by yangyang
2016-01-13 11:40:18 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
493ba2fa

by lore-w
2016-01-13 11:36:48 +0800
Browse Files
注册联调、字段修改 code review by liuyue
41295202

by lore-w
2016-01-13 11:36:25 +0800
Browse Files
搜索页面商品每行5个
a9fefd10

by 毕凯
2016-01-13 11:33:24 +0800
Browse Files
修改Search.php下一个小错误
e02f8296

by yangyang
2016-01-13 11:03:47 +0800
Browse Files
搜索页面筛选框优化
02f05936

by 毕凯
2016-01-13 11:02:25 +0800
Browse Files
品牌搜索页面自动关注
50f020f8

by 毕凯
2016-01-13 10:02:32 +0800
Browse Files

12 Jan, 2016

28 commits

修改new页数据，填写banner假数据
2b7ef7da

by yangyang
2016-01-12 18:52:45 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
3f58ba04

by whb
2016-01-12 18:50:23 +0800
Browse Files
最新上架增加统计位置
ac0b12e5

by whb
2016-01-12 18:49:43 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
51382f6b

by xiaowei
2016-01-12 18:41:50 +0800
Browse Files
PC重构-登录
0e4d3400

by xiaowei
2016-01-12 18:40:48 +0800
Browse Files
Merge branch 'feature/web-list' of http://git.dev.yoho.cn/web/yohobuy into feature/web-list
5cdb1598

by yangyang
2016-01-12 18:35:57 +0800
Browse Files
new写了一半
3c7c63b0

by yangyang
2016-01-12 18:35:20 +0800
Browse Files
提交gulp ge 文件
30ea5a90

by 梁志锋
2016-01-12 18:29:34 +0800
Browse Files
商品分类按搜索条件显示
346b0323

by 周少峰
2016-01-12 18:27:20 +0800
Browse Files
Merge branch 'hotfix/yohocoinuse' into beta ...
cec4d302
```
Conflicts:
	library/Api/Yohobuy.php
	static/js/cart/good.js
	static/js/cart/order-ensure.js
```
by Rock Zhang
2016-01-12 18:26:57 +0800
Browse Files
修复收藏的商品以及品牌页面价格格式错误的bug ...
d28cf384
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-01-12 18:24:30 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
922cfc0b

by whb
2016-01-12 18:22:29 +0800
Browse Files
修改sale
1fb732db

by whb
2016-01-12 18:21:42 +0800
Browse Files
Merge branch 'beta' of git.dev.yoho.cn:web/yohobuy into beta
d818471f

by Rock Zhang
2016-01-12 18:18:06 +0800
Browse Files
修复3.2.3bug的代码
cc23bab8

by 梁志锋
2016-01-12 18:16:29 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into beta
06ab45cf

by 梁志锋
2016-01-12 18:14:46 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
14a99a31

by 毕凯
2016-01-12 18:11:12 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
88fea3df

by whb
2016-01-12 18:07:20 +0800
Browse Files
'有货币样式修改本地分支丢失零时提交'
9eca499f

by uedxwg
2016-01-12 18:05:45 +0800
Browse Files
去掉Bom
01bf57e9

by whb
2016-01-12 18:04:53 +0800
Browse Files
Merge branch 'feature/web-list' of http://git.dev.yoho.cn/web/yohobuy into feature/web-list
d6a2a749

by yangyang
2016-01-12 17:43:29 +0800
Browse Files
修改品牌页和sale页商品数量显示问题
218d9d81

by yangyang
2016-01-12 17:43:10 +0800
Browse Files
Merge branch 'beta' of git.dev.yoho.cn:web/yohobuy into beta
f5741a97

by Rock Zhang
2016-01-12 17:24:16 +0800
Browse Files
去除频道页custom_brands模板类型添加的gender参数 ...
08482c65
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-01-12 17:23:40 +0800
Browse Files
创意生活频道页添加两张小图模板 ...
10d0e351
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-01-12 17:19:54 +0800
Browse Files
修改商品评价为0 不显示的问题
6cfa9c2b

by 梁志锋
2016-01-12 17:16:29 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
7ee3f55d

by 毕凯
2016-01-12 17:12:05 +0800
Browse Files
注释商品详情页面咨询的查看更多绑定的JS，code review by @liangzhiferngn
6c25ac35

by 毕凯
2016-01-12 17:11:54 +0800
Browse Files