fe / YOHOBUYPC · Commits

21 Dec, 2015

12 commits

update to fix below issues: 1. request recommand for you only when there is no g… ...
ca7f2770
```
…ood in cart. 2. the coupon img could be left up when input focused. code review by XWG.
```
by biao
2015-12-21 11:15:55 +0800
Browse Files
update to fix below issues: 1. request recommand for you only when there is no g… ...
d8188806
```
…ood in cart. 2. the coupon img could be left up when input focused. code review by XWG.
```
by biao
2015-12-21 11:15:39 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/issue
de935d72

by biao
2015-12-21 11:13:17 +0800
Browse Files
merge code
f0edaaeb

by 毕凯
2015-12-21 10:37:11 +0800
Browse Files
顺丰快递点击不支持的时候不选中
06adccec

by 毕凯
2015-12-21 10:36:53 +0800
Browse Files
Merge branch 'develop' into 'develop' ...
f864a823
```
Develop

购物车数量选择修改

See merge request !49
```
by 赵彪
2015-12-21 10:35:10 +0800
Browse Files
'清理部分修改'
87e995c3

by uedxwg
2015-12-21 10:24:44 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
3a936b5e

by uedxwg
2015-12-21 10:20:01 +0800
Browse Directory »
'加价购不可编辑和添加商品数量'
f8c47794

by uedxwg
2015-12-21 10:19:33 +0800
Browse Directory »
购物车尺码颜色选择
4b956eca

by 梁志锋
2015-12-21 10:09:05 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4d8b3630

by uedxwg
2015-12-21 09:47:59 +0800
Browse Directory »
'update'
d8d8d3fc

by uedxwg
2015-12-21 09:47:24 +0800
Browse Files

20 Dec, 2015

28 commits

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
ec0164e9

by 梁志锋
2015-12-20 22:16:13 +0800
Browse Files
购物车修改
04239f95

by 梁志锋
2015-12-20 22:15:59 +0800
Browse Directory »
购物车修改
5c921b8b

by 梁志锋
2015-12-20 22:15:52 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
a2459da6

by uedxwg
2015-12-20 22:11:14 +0800
Browse Files
'购物车数量修改'
f7aabc35

by uedxwg
2015-12-20 22:10:45 +0800
Browse File »
code review by hf: fixes bug to add shopping to cart
d9bdb439

by hf
2015-12-20 21:48:39 +0800
Browse Directory »
code review by hf: fixes bug to add shopping to cart
017e6143

by hf
2015-12-20 21:47:11 +0800
Browse Files
修复加价购页面组名称显示错误的bug
71a51382

by Rock Zhang
2015-12-20 21:41:07 +0800
Browse Files
修复确认订单页面，去勾选有货币后，进入优惠券选择使用优惠券成功后，返回之后yoho币被重新选中中
397e5622

by Rock Zhang
2015-12-20 21:38:03 +0800
Browse Directory »
修复各种购物车结算页面当商品为空时的处理逻辑
a9110184

by Rock Zhang
2015-12-20 21:19:32 +0800
Browse Files
修改结算页加价购商品的价格
137cb131

by Rock Zhang
2015-12-20 21:13:19 +0800
Browse Files
去除购物车小房子按钮
db37c86f

by Rock Zhang
2015-12-20 21:07:58 +0800
Browse Files
修改加价购或者赠品详情的尺码与颜色的数据结构
a4d78e36

by Rock Zhang
2015-12-20 20:58:47 +0800
Browse Files
'购物车样式修改'
75b171dc

by uedxwg
2015-12-20 20:57:13 +0800
Browse File »
修复购物车加价购商品显示选择框的bug
6eb009f9

by Rock Zhang
2015-12-20 20:45:19 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e27931bb

by uedxwg
2015-12-20 20:41:20 +0800
Browse Files
'upadte'
a16061dc

by uedxwg
2015-12-20 20:40:54 +0800
Browse File »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
ba8f9c4d

by Rock Zhang
2015-12-20 20:37:38 +0800
Browse Files
code review by hf: fixes bug to add shopping to cart
8b1d3edc

by hf
2015-12-20 20:36:48 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4a0fa02d

by hf
2015-12-20 20:34:12 +0800
Browse Files
code review by hf: fixes bug to add shopping to cart
da7adc44

by hf
2015-12-20 20:34:00 +0800
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
1bd282bf

by Rock Zhang
2015-12-20 20:26:29 +0800
Browse Files
Merge branch 'fix/issue' into 'develop' ...
2f14572a
```
解决问题

1. 详情页页面，当购物车内商品为0时，购物车图标上不显示数字0.
2.购物车页面，已参加活动标题重复问题修复

See merge request !48
```
by 梁志锋
2015-12-20 20:18:30 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/issue
6f68e54a

by biao
2015-12-20 20:15:47 +0800
Browse Files
fix issues: 1. 详情页页面，当购物车内商品为0时，购物车图标上不显示数字0. 2.购物车页面，已参加活动标题重复问题修复. code review by LZF
4af6c77c

by biao
2015-12-20 20:15:29 +0800
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
bf852009
```
Conflicts:
	library/LibModels/Wap/Home/CartData.php
```
by Rock Zhang
2015-12-20 20:13:28 +0800
Browse Files
购物车修改 reviewed by zhaobiao
a477ca67

by 梁志锋
2015-12-20 20:05:16 +0800
Browse Directory »
购物车功能修改
abcfba99

by 梁志锋
2015-12-20 19:58:09 +0800
Browse Directory »