fe / YOHOBUYPC · Commits

21 Dec, 2015

40 commits

code review by hf: merge master code to develop
8b1ebfad

by hf
2015-12-22 01:50:53 +0800
Browse Files
Merge branch 'develop' into test
d241fee3

by hf
2015-12-22 01:48:37 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
70cdc7b3

by hf
2015-12-22 01:48:30 +0800
Browse Files
code review by hf: merge master code to develop
d79f108b

by hf
2015-12-22 01:48:20 +0800
Browse Files
Merge branch 'fix/issue' into 'develop' ...
6fd37402
```
 修复结算校验bug

See merge request !67
```
by 赵彪
2015-12-22 01:41:16 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/issue
3c027318

by biao
2015-12-22 01:38:41 +0800
Browse Files
修复结算校验bug. code review by ZB
f06d94b4

by biao
2015-12-22 01:38:24 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
d88be349

by Rock Zhang
2015-12-22 01:30:42 +0800
Browse Files
修复结算页商品价格显示
cbbe9af4

by Rock Zhang
2015-12-22 01:30:37 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4c1be92e

by 毕凯
2015-12-22 01:24:28 +0800
Browse Files
取消订单提醒触发
f4820062

by 毕凯
2015-12-22 01:24:23 +0800
Browse Files
Merge branch 'develop' into 'develop' ...
4b083d1d
```
Develop

1:加价购和赠品长度修改
2:购物车商品列表底部灰边

See merge request !66
```
by 赵彪
2015-12-22 01:20:36 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
874a4ef9

by 毕凯
2015-12-22 01:04:58 +0800
Browse Files
订单确认点击按钮触发区域变大
34728cdf

by 毕凯
2015-12-22 01:04:52 +0800
Browse Files
修复购物车中价格又小数时的bug
e27e02aa

by Rock Zhang
2015-12-22 00:56:16 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c42ad1dd

by hf
2015-12-22 00:53:39 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e9384b0b

by uedxwg
2015-12-22 00:49:05 +0800
Browse Files
'加价购和赠品长度修改'
9726c052

by uedxwg
2015-12-22 00:48:49 +0800
Browse Files
Merge branch 'fix/issue' into 'develop' ...
4028a0e1
```
优化 购物车页面 checkbox 和 删除按钮位置

See merge request !65
```
by weiguang.xie
2015-12-22 00:47:25 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/issue
679274f5

by biao
2015-12-22 00:44:06 +0800
Browse Files
解决加入购物车弹窗出现时，页面滑动问题. code review by LZF
069c4ee6

by biao
2015-12-22 00:43:06 +0800
Browse Files
code review by hf: merge master code to develop
7e62da23

by hf
2015-12-22 00:38:58 +0800
Browse Files
Merge branch 'develop' into test
2a648a91

by hf
2015-12-22 00:36:42 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
100ca0e3

by hf
2015-12-22 00:36:30 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
a3d7b4b0

by uedxwg
2015-12-22 00:31:38 +0800
Browse Files
code review by hf: merge master code ti develop
f2b1294f

by hf
2015-12-22 00:22:41 +0800
Browse Files
'购物车商品列表文字过大修改'
362d93be

by uedxwg
2015-12-22 00:21:31 +0800
Browse Files
code review by hf: merge master code ti develop
e317ad8e

by hf
2015-12-22 00:18:09 +0800
Browse Files
Merge branch 'develop' into test
86aff785

by hf
2015-12-22 00:17:38 +0800
Browse Files
code review by hf: merge master code ti develop
e48cab08

by hf
2015-12-22 00:17:29 +0800
Browse Files
code review by hf: merge master code ti develop
879f6945

by hf
2015-12-22 00:14:48 +0800
Browse Files
Merge branch 'develop' into test
469f59ea

by hf
2015-12-22 00:08:56 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
6b5cf522

by hf
2015-12-22 00:08:38 +0800
Browse Files
fixes bugs to modify analysis js to async
11d551e0

by hf
2015-12-22 00:08:14 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
84b1661e

by 梁志锋
2015-12-22 00:05:58 +0800
Browse Files
购物车提示框只显示一次
93675765

by 梁志锋
2015-12-22 00:05:39 +0800
Browse Files
优化购物车页面 checkbox 和删除按钮位置. code review by XWG
305f527f

by biao
2015-12-22 00:04:58 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
976d5a4f

by Rock Zhang
2015-12-21 23:50:03 +0800
Browse Files
修复加价购和赠品价格的显示逻辑（改成last_price） ...
f39a7285
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-21 23:49:24 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
bbc01df3

by 毕凯
2015-12-21 23:47:40 +0800
Browse Files