fe / YOHOBUYPC · Commits

25 Dec, 2015

24 commits

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

by 毕凯
2015-12-25 15:47:18 +0800
Browse Files
优惠券不可用背景用灰色图片
c1fc0c24

by 毕凯
2015-12-25 15:47:13 +0800
Browse Files
code review by hf: do format php codes
05b1b0a6

by hf
2015-12-25 15:29:51 +0800
Browse Files
code review by hf: do format php codes
c495b43b

by hf
2015-12-25 15:27:22 +0800
Browse Files
Merge branch 'fix/issue' into 'develop' ...
24d519c3
```
优化购物车页面加价购和赠品栏样式

See merge request !83
```
by 赵彪
2015-12-25 14:47:12 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/issue
12b840a1

by biao
2015-12-25 14:37:36 +0800
Browse Files
优化购物车页面加价购和赠品栏样式。code review by XWG
5ec291e9

by biao
2015-12-25 14:37:23 +0800
Browse Files
Merge branch 'develop' into 'develop' ...
152de977
```
Develop

'帮助中心样式修改'

See merge request !82
```
by 赵彪
2015-12-25 14:31:35 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
d40fbd4a

by uedxwg
2015-12-25 14:28:00 +0800
Browse Files
do format php code
848e0920

by hf
2015-12-25 14:27:40 +0800
Browse Files
'帮助中心样式修改'
6d1a9316

by uedxwg
2015-12-25 14:27:36 +0800
Browse Files
do format php code
1d510a0a

by hf
2015-12-25 14:26:32 +0800
Browse Files
Merge branch 'develop' into 'develop' ...
01d67ba9
```
Develop

活动列表样式修改

See merge request !81
```
by 赵彪
2015-12-25 13:55:55 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
6a9caf28

by uedxwg
2015-12-25 13:48:39 +0800
Browse Files
'活动列表样式修改'
10f7ead0

by uedxwg
2015-12-25 13:48:12 +0800
Browse Files
地址列表为空时样式问题
63f802d3

by 毕凯
2015-12-25 13:39:02 +0800
Browse Files
Merge branch 'fix/issue' into 'develop' ...
cb791309
```
结算时如有库存不足的商品，显示库存不足商品种类数量

See merge request !79
```
by 梁志锋
2015-12-25 13:17:39 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/issue
7c358e56

by biao
2015-12-25 13:14:12 +0800
Browse Files
结算时如有库存不足的商品，显示库存不足商品种类数量。 code review by LZF.
427152a2

by biao
2015-12-25 13:14:04 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4576784a

by 毕凯
2015-12-25 11:03:22 +0800
Browse Files
订单详情页面统一返回订单列表
520d816f

by 毕凯
2015-12-25 11:03:16 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
b0740ca4

by hf
2015-12-25 11:02:21 +0800
Browse Files
do add php docs coding tips
45260fc9

by hf
2015-12-25 11:02:01 +0800
Browse Files
地址选择页面地址修改优化
e86637b5

by 毕凯
2015-12-25 10:31:54 +0800
Browse Files

24 Dec, 2015

16 commits

code review by hf: merge liangzhifeng and zhangzhen codes do fixes some bugs
10fc6ffc

by hf
2015-12-24 18:58:11 +0800
Browse Files
code review by hf: merge liangzhifeng and zhangzhen codes do fixes some bugs
de9d70bd

by hf
2015-12-24 18:27:51 +0800
Browse Files
code review by hf: merge liangzhifeng and zhangzhen codes do fixes some bugs
1a3c85ed

by hf
2015-12-24 18:26:34 +0800
Browse Files
Merge remote-tracking branch 'origin/develop'
ec84ac9f

by hf
2015-12-24 18:19:50 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
f1070281

by 梁志锋
2015-12-24 18:16:33 +0800
Browse Files
购物车修改
ac35c533

by 梁志锋
2015-12-24 18:16:23 +0800
Browse Files
订单列表删除订单优化
b617b7f7

by 毕凯
2015-12-24 18:08:24 +0800
Browse Files
Merge remote-tracking branch 'origin/develop'
2ec7d183

by hf
2015-12-24 18:02:41 +0800
Browse Files
code review by hf: merge liangzhifeng and zhangzhen codes do fixes some bugs
9c0780fd

by hf
2015-12-24 18:02:18 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
2866b4d1

by 毕凯
2015-12-24 17:41:52 +0800
Browse Files
加入购物车数字颜色阴影修改
9e125e57

by 毕凯
2015-12-24 17:41:48 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
ac4088e3

by 梁志锋
2015-12-24 17:33:35 +0800
Browse Files
选颜色尺码时报库存不足的错误
9fc9efaf

by 梁志锋
2015-12-24 17:32:36 +0800
Browse Files
购物车 vip 颜色
19bd10f4

by 毕凯
2015-12-24 17:23:53 +0800
Browse Files
code review by hf: merge liangzhifeng and zhangzhen codes do fixes some bugs
7aa3f36d

by hf
2015-12-24 17:23:06 +0800
Browse Files
do fixes some bugs
5f5707e0

by hf
2015-12-24 17:16:25 +0800
Browse Files