fe / YOHOBUYWAP · Commits

21 Dec, 2015

40 commits

Merge branch 'fix/issue' into 'develop' ...
0e95676e
```
修复注册和绑定手机号时，重复请求验证码的bug

See merge request !56
```
by weiguang.xie
2015-12-21 17:18:51 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
7ab492a7

by 梁志锋
2015-12-21 17:15:25 +0800
Browse Files
购物车赠品不可删除
72db7114

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

by 毕凯
2015-12-21 17:14:31 +0800
Browse Files
支付的返回返回到购物车
4684a2ca

by 毕凯
2015-12-21 17:14:27 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
2ede231e

by xuqi
2015-12-21 17:12:31 +0800
Browse Files
cart with cehckbox disabled
c09ae64a

by xuqi
2015-12-21 17:12:15 +0800
Browse Files
update for prevent duplicate submit for requesting mobile verify code. code review by XWG
cf97d1a6

by biao
2015-12-21 17:10:29 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
fdb11403

by 梁志锋
2015-12-21 17:01:44 +0800
Browse Files
购物车尺码和颜色修改
609034a7

by 梁志锋
2015-12-21 17:01:20 +0800
Browse Files
login跳转手机绑定页跳转优化
4fd21c8d

by xiaowei
2015-12-21 16:59:34 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
6d5e4cf4

by xuqi
2015-12-21 16:49:31 +0800
Browse Files
balance cannot click when current not .hide content has no .checked
416b7fb4

by xuqi
2015-12-21 16:49:10 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
20b20fb4

by 梁志锋
2015-12-21 16:45:44 +0800
Browse Files
购物车修改
dc36473f

by 梁志锋
2015-12-21 16:45:21 +0800
Browse Files
购物车修改
1c1508e9

by 梁志锋
2015-12-21 16:39:11 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
7fce67db

by uedxwg
2015-12-21 16:33:59 +0800
Browse Files
'购物判断条件修改'
a215519c

by uedxwg
2015-12-21 16:32:41 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
ce6b71c2

by xuqi
2015-12-21 16:29:40 +0800
Browse Files
cart block with margin
51603d90

by xuqi
2015-12-21 16:29:30 +0800
Browse Files
Merge branch 'fix/issue' into 'develop' ...
550efab2
```
优化购物车商品空checkbox的颜色

See merge request !55
```
by 赵彪
2015-12-21 16:28:03 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
0200d824

by xuqi
2015-12-21 16:27:15 +0800
Browse Files
cart style & invalid goods
b2be84d0

by xuqi
2015-12-21 16:27:08 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/issue
b99171e3

by biao
2015-12-21 16:25:28 +0800
Browse Files
optimise empty checkbox color. code review by ZB
3ae35a7a

by biao
2015-12-21 16:25:20 +0800
Browse Files
'购物判断条件修改'
e2a7339f

by uedxwg
2015-12-21 16:24:16 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
542e7537

by Rock Zhang
2015-12-21 16:16:20 +0800
Browse Files
添加失效商品的标志 ...
68d17b36
```
Code Reveiw By Rock Zhang
```
by Rock Zhang
2015-12-21 16:15:58 +0800
Browse Files
加价购选择太灵敏
1c9ef44d

by 毕凯
2015-12-21 16:08:37 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
89231601

by 毕凯
2015-12-21 15:56:41 +0800
Browse Files
加价购不显示库存
eb7e67bc

by 毕凯
2015-12-21 15:56:36 +0800
Browse Files
购物车修改 code review by zhaobiao
f36280e7

by 梁志锋
2015-12-21 15:17:39 +0800
Browse Files
购物车商品数量取返回值
15d0b43b

by 梁志锋
2015-12-21 15:12:33 +0800
Browse Files
Merge branch 'fix/issue' into 'develop' ...
5652976d
```
修改库存不足提示字样

See merge request !54
```
by 赵彪
2015-12-21 15:04:32 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
6fb954d0

by 毕凯
2015-12-21 15:03:23 +0800
Browse Files
加入购物车数字 99+
5de219ee

by 毕凯
2015-12-21 15:03:17 +0800
Browse Files
库存不足提示字样更新. code review by zhaobiao
24c52379

by biao
2015-12-21 15:01:33 +0800
Browse Files
Merge branch 'develop' into 'develop' ...
2c6b3cbe
```
Develop

1:商品库存验证
2:商品文字超长修改
3:购物车数字不能点击

See merge request !53
```
by 赵彪
2015-12-21 14:58:09 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
06fb06b7

by 毕凯
2015-12-21 14:55:24 +0800
Browse Files
优惠券名称特别长修复
f366c2b2

by 毕凯
2015-12-21 14:55:08 +0800
Browse Files