fe / YOHOBUYWAP · Commits

18 Dec, 2015

9 commits

悬浮购物车数字大于99 显示99+
77ea1464

by 毕凯
2015-12-18 11:24:18 +0800
Browse Files
订单确认页面商品标题限制最大长度
5a8ed297

by 毕凯
2015-12-18 11:05:06 +0800
Browse Files
增加不使用优惠券功能
ffdda0eb

by 毕凯
2015-12-18 11:01:03 +0800
Browse Files
暂时不做不可使用的优惠券
b968e70a

by 毕凯
2015-12-18 10:01:50 +0800
Browse Files
订单确认页面商品图片大小
4c887835

by 毕凯
2015-12-18 09:55:22 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
1f47ab7a

by 毕凯
2015-12-18 09:43:44 +0800
Browse Files
优惠券为空的时候显示 0张可同
4a41352a

by 毕凯
2015-12-18 09:43:38 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
d6c8910f

by hf
2015-12-18 09:40:08 +0800
Browse Files
code review by hf: do format product detail data structure
9d5d2c5d

by hf
2015-12-18 09:40:04 +0800
Browse Files

17 Dec, 2015

31 commits

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

by hf
2015-12-17 20:56:08 +0800
Browse Files
do gzip product detail page images
ec5c370c

by hf
2015-12-17 20:55:56 +0800
Browse Files
结算提示
25a836ba

by 梁志锋
2015-12-17 20:38:35 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c5ac1068

by hf
2015-12-17 20:04:46 +0800
Browse Files
code review by hf: do modify cart list add cartType parameter
afa1ac4d

by hf
2015-12-17 20:04:41 +0800
Browse Files
购物车没有tab时不能结算
e181768d

by 梁志锋
2015-12-17 19:58:34 +0800
Browse Files
修改购物车tab
4c666bbe

by 梁志锋
2015-12-17 19:32:33 +0800
Browse Files
修改购物车tab
ee8e71f2

by 梁志锋
2015-12-17 19:31:29 +0800
Browse Files
code review by hf: do modify cart list add cartType parameter
048c41f0

by hf
2015-12-17 19:12:47 +0800
Browse Files
code review by hf: do modify cart list add cartType parameter
6e4c99b7

by hf
2015-12-17 19:10:49 +0800
Browse Files
修复预售商品或者普通商品又一个为0时顶部栏不显示
cb04ece3

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

by 毕凯
2015-12-17 18:20:50 +0800
Browse Files
加入购物车数字转换
9f6756f3

by 毕凯
2015-12-17 18:20:45 +0800
Browse Files
Merge branch 'fix/cart' into 'develop' ...
a6996b0d
```
购物车页面，未登录时，不显示普通商品／预售商品 选项

See merge request !45
```
by 梁志锋
2015-12-17 18:18:30 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
846f720b

by Rock Zhang
2015-12-17 18:10:25 +0800
Browse Files
修复默认选中的支付方式为在线支付
84543ee0

by Rock Zhang
2015-12-17 18:10:02 +0800
Browse Files
update to hide cart page nav when user does not login. code review by LZF
f119a456

by biao
2015-12-17 18:01:42 +0800
Browse Directory »
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
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
7febb380

by Rock Zhang
2015-12-17 17:59:25 +0800
Browse Files
修复结算页选择优惠券是否可用逻辑判断错误的bug ...
3a025436
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-17 17:58:59 +0800
Browse Files
尺寸选择尺寸宽度修改
c8cf3354

by 毕凯
2015-12-17 17:51:33 +0800
Browse Files
修复库存不足标记显示的bug；失效商品不显示库存不足 ...
71638187
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-17 17:19:28 +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 Directory »
加价购加入购物车
a95117bb

by 毕凯
2015-12-17 17:08:14 +0800
Browse Directory »
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
修复商品详情页商品详情弹出层价格显示反掉的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 »