wangshusheng / YOHOBUYPC · Commits

17 Dec, 2015

40 commits

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

by hf
2015-12-17 18:01:17 +0800
Browse Files
code review by hf: do format channel code add exception handle
72607438

by hf
2015-12-17 18:00:58 +0800
Browse Files
尺寸选择尺寸宽度修改
c8cf3354

by 毕凯
2015-12-17 17:51:33 +0800
Browse Files
Merge branch 'fix/cart' into 'develop' ...
2c98cb54
```
修复购物车页面左右滚动问题

See merge request !43
```
by weiguang.xie
2015-12-17 17:15:53 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
93d06f49

by 毕凯
2015-12-17 17:08:24 +0800
Browse Files
加价购加入购物车
a95117bb

by 毕凯
2015-12-17 17:08:14 +0800
Browse Files
sync to develop
f577557b

by biao
2015-12-17 17:08:05 +0800
Browse Files
update to fix cart scroll issue. code review by LZF
fd9651af

by biao
2015-12-17 17:01:41 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/cart
4625e820

by biao
2015-12-17 16:58:13 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
b0868889
```
Conflicts:
	template/m.yohobuy.com/partials/cart/good.phtml
	yohobuy/m.yohobuy.com/application/models/Index/Cart.php
	yohobuy/m.yohobuy.com/application/modules/Cart/controllers/Index.php
```
by Rock Zhang
2015-12-17 16:34:53 +0800
Browse Files
修复加入购物车弹窗中价格显示的bug，统一显示接口返回的价格样式 ...
080fcaba
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-17 16:24:28 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
1f6e19d7

by hf
2015-12-17 16:23:37 +0800
Browse Files
code review by hf: do format channel choose code
b55a691d

by hf
2015-12-17 16:23:28 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
62515af2

by 毕凯
2015-12-17 16:20:49 +0800
Browse Files
购物车 bug 修复
57d1fead

by 毕凯
2015-12-17 16:20:45 +0800
Browse Files
购物车圆点数字显示
e97ce007

by 毕凯
2015-12-17 16:20:14 +0800
Browse Files
添加获取购物车数目接口
528c2758

by Rock Zhang
2015-12-17 16:11:05 +0800
Browse Files
Merge branch 'fix/cart' into 'develop' ...
b5d6f285
```
修复购物车问题

1. 占位图样式修改
2. 修复图片不显示问题

See merge request !41
```
by 梁志锋
2015-12-17 16:09:08 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/cart
867ecce2

by biao
2015-12-17 16:02:58 +0800
Browse Files
订单确认价格显示 .00
a0d24e66

by 毕凯
2015-12-17 16:02:09 +0800
Browse Files
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into fix/cart
f41e2d3d

by biao
2015-12-17 15:59:56 +0800
Browse Files
update to fix the img can not display bug. code review by LZF
ca0af99a

by biao
2015-12-17 15:58:42 +0800
Browse Files
修改优惠券使用后跳转地址
ccd53b96

by 毕凯
2015-12-17 15:53:43 +0800
Browse Files
优惠券使用不能为空
11fe139f

by 毕凯
2015-12-17 15:48:10 +0800
Browse Files
update for loading failure pic size. code review by LZF
247592c8

by biao
2015-12-17 15:31:10 +0800
Browse Files
修复选择和全选按钮报错的bug，以及选择状态不能保存的bug ...
59b74d51
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-17 15:22:59 +0800
Browse Files
修复购物车选择和全选按钮报错的bug（接收参数名错误导致） ...
6aa037e9
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-17 15:06:48 +0800
Browse Files
YW-1680 在线客服标题问题
5a8f26ea

by xiaowei
2015-12-17 15:03:39 +0800
Browse Files
修复删除商品时只能删除一个的bug
ddf0463b

by Rock Zhang
2015-12-17 15:02:05 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
fce005df

by 毕凯
2015-12-17 14:57:42 +0800
Browse Files
不同用户确认订单cookie信息隔离
64897654

by 毕凯
2015-12-17 14:57:36 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
820ff827

by hf
2015-12-17 14:56:41 +0800
Browse Files
code review by hf: fixes bug refs YW-1662 filter exception api return data
de617a45

by hf
2015-12-17 14:56:26 +0800
Browse Files
优惠券为空时获取出错的bug
f30f5fd9

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

by 毕凯
2015-12-17 14:40:36 +0800
Browse Files
优惠券一直显示
4487a45f

by 毕凯
2015-12-17 14:40:32 +0800
Browse Files
订单结算页面样式修改
dc527a9b

by 毕凯
2015-12-17 14:40:16 +0800
Browse Files
code review by hf: fixes some bugs
3f505671

by hf
2015-12-17 14:17:54 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
1f13eede

by biao
2015-12-17 14:14:53 +0800
Browse Files
update to include bind js. code review by hongfei
6e52c4fd

by biao
2015-12-17 14:14:38 +0800
Browse Files