fe / YOHOBUYWAP · Commits

20 Dec, 2015

40 commits

code review by hf: fixes bug to add shopping to cart
8b1d3edc

by hf
2015-12-20 20:36:48 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4a0fa02d

by hf
2015-12-20 20:34:12 +0800
Browse Files
code review by hf: fixes bug to add shopping to cart
da7adc44

by hf
2015-12-20 20:34:00 +0800
Browse Files
Merge branch 'fix/issue' into 'develop' ...
2f14572a
```
解决问题

1. 详情页页面，当购物车内商品为0时，购物车图标上不显示数字0.
2.购物车页面，已参加活动标题重复问题修复

See merge request !48
```
by 梁志锋
2015-12-20 20:18:30 +0800
Browse File »
fix issues: 1. 详情页页面，当购物车内商品为0时，购物车图标上不显示数字0. 2.购物车页面，已参加活动标题重复问题修复. code review by LZF
4af6c77c

by biao
2015-12-20 20:15:29 +0800
Browse File »
购物车修改 reviewed by zhaobiao
a477ca67

by 梁志锋
2015-12-20 20:05:16 +0800
Browse Files
购物车功能修改
abcfba99

by 梁志锋
2015-12-20 19:58:09 +0800
Browse Directory »
Merge branch 'develop' into 'develop' ...
81198140
```
Develop

See merge request !47
```
by 赵彪
2015-12-20 19:38:35 +0800
Browse Files
'加价购冲突解决'
7729cbbe

by uedxwg
2015-12-20 19:32:22 +0800
Browse File »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
de5c322d

by 毕凯
2015-12-20 19:00:15 +0800
Browse Files
不支持顺丰提示
0e1b1bef

by 毕凯
2015-12-20 19:00:09 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
f41808fc

by 梁志锋
2015-12-20 18:37:03 +0800
Browse Files
购物车逻辑
ba1ea092

by 梁志锋
2015-12-20 18:36:49 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
f9a8e785

by 毕凯
2015-12-20 18:09:00 +0800
Browse Files
切换用户的时候刷新页面
761f9bf9

by 毕凯
2015-12-20 18:08:52 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
96b71dfd

by hf
2015-12-20 18:07:49 +0800
Browse Files
code review by hf: fixes bug refs YW-1720
64e16a81

by hf
2015-12-20 18:07:43 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
d39eb4ce

by hf
2015-12-20 18:06:38 +0800
Browse Files
code review by hf: do fixes bugs to show shopping cart count
59d1fb46

by hf
2015-12-20 18:06:20 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/issue
44cb0ef0

by biao
2015-12-20 18:01:42 +0800
Browse Files
cookie 增加购物车类型
673938aa

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

by 毕凯
2015-12-20 17:44:53 +0800
Browse Files
显示加价购标签
d8166df5

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

by 梁志锋
2015-12-20 17:42:31 +0800
Browse Files
购物车修改
aa9e9ab8

by 梁志锋
2015-12-20 17:42:17 +0800
Browse Files
购物车修改
a1a45911

by 梁志锋
2015-12-20 17:42:02 +0800
Browse Files
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