fe / YOHOBUYWAP · Commits

20 Dec, 2015

40 commits

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

by 毕凯
2015-12-20 17:33:52 +0800
Browse Files
输入优惠券号码使用
6246045b

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

by 梁志锋
2015-12-20 17:28:08 +0800
Browse Files
购物车修改
359b3874

by 梁志锋
2015-12-20 17:27:56 +0800
Browse Files
优惠券名称字段
95dd50ba

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

by 毕凯
2015-12-20 17:22:37 +0800
Browse Files
订单确认返回购物车
183e3cda

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

by 梁志锋
2015-12-20 17:21:45 +0800
Browse Files
购物车修改
a3f2008d

by 梁志锋
2015-12-20 17:21:34 +0800
Browse Files
购物车修改
1567cbd2

by 梁志锋
2015-12-20 17:21:14 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
9426553f

by Rock Zhang
2015-12-20 17:16:35 +0800
Browse Files
加价购和赠品页面添加cartType字段
229584c7

by Rock Zhang
2015-12-20 17:16:19 +0800
Browse Files
Merge branch 'fix/issue' into 'develop' ...
04da7aac
```
修复一些问题

1.我要咨询不跳转; 2.第三方登录重复发送验证码; 3. 加入购物页面，商品的图片被拉伸

See merge request !46
```
by 梁志锋
2015-12-20 17:07:53 +0800
Browse Files
merge code
1f6fbdbf

by 毕凯
2015-12-20 17:06:10 +0800
Browse Files
优惠券显示优惠券名称
46deb890

by 毕凯
2015-12-20 17:05:47 +0800
Browse Files
Merge branch 'addfiles' into 'develop' ...
d400480f
```
add icon

See merge request !42
```
by 赵彪
2015-12-20 17:04:26 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
eac281e9

by Rock Zhang
2015-12-20 16:56:39 +0800
Browse Files
添加结算页中加价购或者赠品的标识 ...
827ad7a5
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-20 16:55:53 +0800
Browse Files
fix issues: 1.我要咨询不跳转; 2.第三方登录重复发送验证码; 3. 加入购物页面，商品的图片被拉伸. code review by LZF
f8a8833a

by biao
2015-12-20 16:52:51 +0800
Browse Files
修改结算页面发票以及支付方式的一些逻辑
6156ed1e

by Rock Zhang
2015-12-20 16:44:42 +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
添加浏览记录商品链接地址
842627f3

by Rock Zhang
2015-12-20 16:03:54 +0800
Browse Files
订单确认页面，页面的右上角没有小房子按钮
9800d3aa

by 毕凯
2015-12-20 16:03:49 +0800
Browse Files
添加购物车商品链接地址
001c1d86

by Rock Zhang
2015-12-20 16:02:09 +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