fe / YOHOBUYPC · Commits

20 Dec, 2015

40 commits

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
bf852009
```
Conflicts:
	library/LibModels/Wap/Home/CartData.php
```
by Rock Zhang
2015-12-20 20:13:28 +0800
Browse Files
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
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
修复未登录状态下商品只能加入一个的bug
7bf0d818

by Rock Zhang
2015-12-20 17:39:06 +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
优惠券显示优惠券名称
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