fe / YOHOBUYWAP · Commits

21 Dec, 2015

40 commits

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

by 毕凯
2015-12-22 05:09:34 +0800
Browse Files
优惠券背景灰色兼容
4c2790e8

by 毕凯
2015-12-22 05:09:28 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
bd8887a6

by xuqi
2015-12-22 05:04:22 +0800
Browse Files
presell mellipsis
df96a6c4

by xuqi
2015-12-22 05:00:42 +0800
Browse Files
删除空行
e31b2594

by 梁志锋
2015-12-22 04:33:35 +0800
Browse Directory »
购物车切换
d120dd86

by 梁志锋
2015-12-22 04:24:34 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c0aa4e3f

by xuqi
2015-12-22 03:57:13 +0800
Browse Files
mlellipsis
80db51b6

by xuqi
2015-12-22 03:57:00 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
0d274923

by Rock Zhang
2015-12-22 03:54:04 +0800
Browse Directory »
修复预售商品结算时，选择地址之后会变为普通购物车的bug
82435a40

by Rock Zhang
2015-12-22 03:53:44 +0800
Browse Directory »
balance alert
c951d44a

by xuqi
2015-12-22 03:42:57 +0800
Browse Files
购物车切换
14e617b0

by 梁志锋
2015-12-22 03:25:26 +0800
Browse Files
购物车修改
0175898e

by 梁志锋
2015-12-22 03:10:25 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
9b7092d4

by 梁志锋
2015-12-22 02:55:08 +0800
Browse Files
购物车修改
bcd587fc

by 梁志锋
2015-12-22 02:54:49 +0800
Browse Files
购物车修改
746a5419

by 梁志锋
2015-12-22 02:54:38 +0800
Browse Files
code review by hf: fixes some bugs to merge code
dae9d5ff

by hf
2015-12-22 02:43:13 +0800
Browse Directory »
code review by hf: fixes some bugs to merge code
d17a907d

by hf
2015-12-22 02:40:11 +0800
Browse Directory »
code review by hf: fixes some bugs to merge code
b31ddaff

by hf
2015-12-22 02:35:07 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
27177aa5

by hf
2015-12-22 02:32:45 +0800
Browse Directory »
修复未登录选择的商品同步到登陆账户 ...
b86782b9
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-22 02:32:00 +0800
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
7f0161a0

by Rock Zhang
2015-12-22 02:22:43 +0800
Browse Directory »
修复购物车页面赠品重复的bug
26e956ec

by Rock Zhang
2015-12-22 02:18:12 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
6464c444

by hf
2015-12-22 02:17:25 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
0f5c5e10

by 梁志锋
2015-12-22 02:04:33 +0800
Browse Files
购物车弹出层z-index修改
8f3b818e

by 梁志锋
2015-12-22 02:03:53 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
70cdc7b3

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

by hf
2015-12-22 01:48:20 +0800
Browse Directory »
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 Directory »
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 Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
874a4ef9

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

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

by Rock Zhang
2015-12-22 00:56:16 +0800
Browse Directory »
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