fe / YOHOBUYPC · Commits

15 Apr, 2016

14 commits

Merge branch 'feature/order' of http://git.dev.yoho.cn/web/yohobuy into feature/order
b383bd2f

by uedxwg
2016-04-15 17:16:03 +0800
Browse Files
冲突修改
6bcc053f

by uedxwg
2016-04-15 17:11:59 +0800
Browse Files
底部用户替换
82f3104a

by uedxwg
2016-04-15 17:08:19 +0800
Browse Files
Merge remote-tracking branch 'origin/feature/order' into feature/order
ec1c95b2

by 梁志锋
2016-04-15 17:03:39 +0800
Browse Files
update assets
a8444abf

by 梁志锋
2016-04-15 16:56:59 +0800
Browse Files
更新到201604151654静态资源
a38b9b92

by Rock Zhang
2016-04-15 16:55:01 +0800
Browse Files
Merge branch 'feature/order' of git.dev.yoho.cn:web/yohobuy into feature/order
2511b107

by Rock Zhang
2016-04-15 16:54:12 +0800
Browse Files
修复购物车中选择赠品或者加价购商品，结算页计算商品总价报错的bug（不应该通过subtotal计算） ...
5199a17b
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-04-15 16:53:07 +0800
Browse Files
Merge branch 'feature/order' of git.dev.yoho.cn:web/yohobuy into feature/order
07b4e5d8

by 毕凯
2016-04-15 16:35:09 +0800
Browse Files
购物车选择框加载优化
51d55e01

by 毕凯
2016-04-15 16:34:46 +0800
Browse Files
赠品加价购取消修改按钮
17d4bbbb

by uedxwg
2016-04-15 16:27:18 +0800
Browse Files
测试提交
7e9083fe

by uedxwg
2016-04-15 15:32:54 +0800
Browse Files
清楚log打印
e0aa5f6e

by uedxwg
2016-04-15 15:26:37 +0800
Browse Files
送货时间修改
83b8416b

by uedxwg
2016-04-15 15:08:46 +0800
Browse Files

14 Apr, 2016

4 commits

修复结算页中价格为0时不显示为0.00的bug ...
567d5a0a
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-04-14 16:29:38 +0800
Browse Files
样式修改
16b31e02

by uedxwg
2016-04-14 15:50:42 +0800
Browse Files
移除抵消yoho币
21bdc3c1

by uedxwg
2016-04-14 11:52:35 +0800
Browse Files
icon样式修改
2c486655

by uedxwg
2016-04-14 11:36:39 +0800
Browse Files

13 Apr, 2016

13 commits

修复选中顺丰快递时，再切换到不支持顺丰快递的地址时不能正确显示的bug ...
b6c8e3a8
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-04-13 20:17:01 +0800
Browse Files
结算页面bug
9658f4e1

by uedxwg
2016-04-13 19:47:32 +0800
Browse Files
手机号修改
7ed2d6e1

by uedxwg
2016-04-13 16:33:28 +0800
Browse Files
修复QQ登陆的bug ...
b9de5e84
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-04-13 15:46:02 +0800
Browse Files
修复QQ登陆时回调到https错误的bug（暂时还原为http） ...
a92a2738
```
Code Review Uy Rock Zhang
```
by Rock Zhang
2016-04-13 15:42:27 +0800
Browse Files
Merge branch 'feature/order' of git.dev.yoho.cn:web/yohobuy into feature/order
0263d470

by Rock Zhang
2016-04-13 15:38:33 +0800
Browse Files
修复商品结算页商品价格错误的bug（更改价格计算方式） ...
e0041074
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-04-13 15:37:52 +0800
Browse Files
订单bug修改
43c77767

by uedxwg
2016-04-13 15:31:48 +0800
Browse Files
订单文字错误修改
f09da1ff

by uedxwg
2016-04-13 14:45:56 +0800
Browse Files
Merge branch 'feature/order' of http://git.dev.yoho.cn/web/yohobuy into feature/order
f428d0c8

by uedxwg
2016-04-13 12:13:19 +0800
Browse Files
订单bug修改
e3056ee2

by uedxwg
2016-04-13 12:12:13 +0800
Browse Files
修复使用免邮券快递价格不对应修改的bug ...
1a27bfa5
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-04-13 11:10:50 +0800
Browse Files
结算bug修改
3155645d

by uedxwg
2016-04-13 09:50:57 +0800
Browse Files

12 Apr, 2016

9 commits

订单bug修改
f01c32b0

by uedxwg
2016-04-12 21:38:51 +0800
Browse Files
订单页面收起
aabc3280

by uedxwg
2016-04-12 20:23:06 +0800
Browse Files
结算页面bug修改
6e774b78

by uedxwg
2016-04-12 19:39:13 +0800
Browse Files
添加结算页快递运费
5a198170

by Rock Zhang
2016-04-12 18:16:30 +0800
Browse Files
Merge branch 'feature/order' of http://git.dev.yoho.cn/web/yohobuy into feature/order
52aaddfc

by uedxwg
2016-04-12 18:06:53 +0800
Browse Files
结算bug修改
89dd6a23

by uedxwg
2016-04-12 18:06:18 +0800
Browse Files
修复结算页商品总数已经商品金额显示错误的bug ...
2dc38416
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-04-12 17:53:30 +0800
Browse Files
Merge branch 'feature/order' of http://git.dev.yoho.cn/web/yohobuy into feature/order
1de999d3

by 梁志锋
2016-04-12 14:23:11 +0800
Browse Files
订单页面bug修改
73485b3a

by uedxwg
2016-04-12 11:52:15 +0800
Browse Files