wangshusheng / YOHOBUYPC · Commits

20 Dec, 2015

28 commits

Merge branch 'addfiles' into 'develop' ...
d400480f
```
add icon

See merge request !42
```
by 赵彪
2015-12-20 17:04:26 +0800
Browse Files
code review by hf: fixes bug refs YW-1720
dd0efa2e

by hf
2015-12-20 16:36:38 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
f6372a19

by hf
2015-12-20 16:34:47 +0800
Browse Files
code review by hf: fixes bug refs YW-1720
9cd0aeb6

by hf
2015-12-20 16:34:32 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
05139a57

by 毕凯
2015-12-20 16:33:22 +0800
Browse Files
删除商品的时候删除优惠券信息
47ec5d26

by 毕凯
2015-12-20 16:33:17 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
19073157

by 梁志锋
2015-12-20 16:26:50 +0800
Browse Files
购物车
07cc5edd

by 梁志锋
2015-12-20 16:26:30 +0800
Browse Files
购物车
8ef6ef46

by 梁志锋
2015-12-20 16:26:14 +0800
Browse Files
清空地址后退回结算界面，发现还保留了最后的地址 fix
0c8ba77e

by 毕凯
2015-12-20 16:15:26 +0800
Browse Files
yoho币为空直接显示无yoho币可用
4b311457

by 毕凯
2015-12-20 16:08:40 +0800
Browse Files
订单确认页面，页面的右上角没有小房子按钮
9800d3aa

by 毕凯
2015-12-20 16:03:49 +0800
Browse Files
价格计算无返回的时候，刷新页面
60a4d194

by 毕凯
2015-12-20 15:46:50 +0800
Browse Files
重新计算价格传入购物车类型
24eca0e0

by 毕凯
2015-12-20 15:34:06 +0800
Browse Files
presell tip
e3c8f4ae

by xuqi
2015-12-20 15:25:53 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4365503d

by xuqi
2015-12-20 15:18:18 +0800
Browse Files
购物车逻辑修改
6dc4d743

by 梁志锋
2015-12-20 15:10:11 +0800
Browse Files
购物车功能修改 review br xuqi
e489ae3a

by 梁志锋
2015-12-20 15:07:25 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
ee71c1e8

by 毕凯
2015-12-20 15:00:22 +0800
Browse Files
加价购加入购物车直接插入 html
8d6379a5

by 毕凯
2015-12-20 15:00:15 +0800
Browse Files
cart good chose
06b08614

by xuqi
2015-12-20 14:58:40 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
d6908b50

by 梁志锋
2015-12-20 14:54:23 +0800
Browse Files
购物车颜色尺码逻辑修改
ab980b0a

by 梁志锋
2015-12-20 14:54:04 +0800
Browse Files
购物车尺码颜色选择
26cb79a7

by 梁志锋
2015-12-20 14:53:27 +0800
Browse Files
code review by hf: fixes bug refs YW-1720
6fe5528b

by hf
2015-12-20 14:45:53 +0800
Browse Files
cart good structure
8a47f6e5

by xuqi
2015-12-20 14:34:47 +0800
Browse Directory »
modify cart chose-panel use tpl render front to end
60f943d2

by hf
2015-12-20 14:09:35 +0800
Browse Files
cart html structure repaire
8e52763f

by xuqi
2015-12-20 13:45:25 +0800
Browse Files

18 Dec, 2015

12 commits

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

by hf
2015-12-18 20:06:43 +0800
Browse Files
code review by hf: fixes bug to coupon newuser second times
ac69a90d

by hf
2015-12-18 20:06:33 +0800
Browse Files
修复购物车结算页选择优惠券中优惠券是否可用的判定逻辑（通过php去过滤掉不可用的优惠券） ...
008a600e
```
但那种免邮券还是不能用

Code Review By Rock Zhang
```
by Rock Zhang
2015-12-18 19:38:31 +0800
Browse Files
code review by hf: fixes bug to coupon newuser second times
a97112aa

by hf
2015-12-18 19:10:05 +0800
Browse Files
修改订单结算页底部的价格有关信息为直接读取接口返回的数据 ...
3568bb9f
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-18 19:01:28 +0800
Browse Files
修复购物车列表页底部活动参与不显示的问题
1794aef3

by Rock Zhang
2015-12-18 18:27:33 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
7f0b2b9e

by Rock Zhang
2015-12-18 18:08:52 +0800
Browse Files
修改加价购商品详情返回的数据格式“
a951b940

by Rock Zhang
2015-12-18 18:08:46 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
58655c07

by xiaowei
2015-12-18 18:03:58 +0800
Browse Files
YW-1678 返回bug
40fb9c07

by xiaowei
2015-12-18 18:03:46 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
d60ed2d1

by 梁志锋
2015-12-18 17:48:38 +0800
Browse Files
购物车尺码颜色选择逻辑
08f569e5

by 梁志锋
2015-12-18 17:48:23 +0800
Browse Files