fe / YOHOBUYWAP · Commits

17 Dec, 2015

40 commits

修复结算页选择优惠券是否可用逻辑判断错误的bug ...
3a025436
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-17 17:58:59 +0800
Browse Files
修复库存不足标记显示的bug；失效商品不显示库存不足 ...
71638187
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-17 17:19:28 +0800
Browse Directory »
修复商品详情页商品详情弹出层价格显示反掉的bug ...
54c3c37d
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-17 16:51:52 +0800
Browse Directory »
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 Directory »
修复加入购物车弹窗中价格显示的bug，统一显示接口返回的价格样式 ...
080fcaba
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-17 16:24:28 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
1f6e19d7

by hf
2015-12-17 16:23:37 +0800
Browse Directory »
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 Directory »
购物车 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 Directory »
Merge branch 'fix/cart' into 'develop' ...
b5d6f285
```
修复购物车问题

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

See merge request !41
```
by 梁志锋
2015-12-17 16:09:08 +0800
Browse Directory »
订单确认价格显示 .00
a0d24e66

by 毕凯
2015-12-17 16:02:09 +0800
Browse Directory »
update to fix the img can not display bug. code review by LZF
ca0af99a

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

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

by 毕凯
2015-12-17 15:48:10 +0800
Browse Directory »
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 Directory »
修复购物车选择和全选按钮报错的bug（接收参数名错误导致） ...
6aa037e9
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-17 15:06:48 +0800
Browse Directory »
YW-1680 在线客服标题问题
5a8f26ea

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

by Rock Zhang
2015-12-17 15:02:05 +0800
Browse Directory »
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 Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
1f13eede

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

by biao
2015-12-17 14:14:38 +0800
Browse Directory »
添加购物车未登录用户的登陆链接地址,修复未登录用户添加商品时设置shopping_key错误的bug ...
0adcaadf
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-17 13:35:32 +0800
Browse Directory »
订单结算价格显示.00
5cfa7721

by 毕凯
2015-12-17 13:31:19 +0800
Browse Directory »
修复未登录、未添加商品到购物车的情况下进入购物车页面，显示普通和预售商品tab的bug，同时添加随便逛逛和为您优选 ...
827570a6
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-17 11:49:05 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
ea93c8c2

by 毕凯
2015-12-17 11:17:58 +0800
Browse Files
修改地址跳转回原来页面问题修改
2c79a11d

by 毕凯
2015-12-17 11:17:54 +0800
Browse Directory »
code review by hf: fixes bug to cart list show goods count 0
ade11f0f

by hf
2015-12-17 11:14:38 +0800
Browse Directory »
添加购物车随便逛逛链接地址
0a9ab07b

by Rock Zhang
2015-12-17 11:11:41 +0800
Browse Directory »
异步返回为空时停止操作
495990d8

by 毕凯
2015-12-17 10:29:50 +0800
Browse Directory »