fe / YOHO-ACTIVITY-PHP · Commits

16 Dec, 2015

40 commits

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
130c0647

by Rock Zhang
2015-12-16 15:23:04 +0800
Browse Files
修复有货币流水页面有货币总数显示不正确的bug ...
32132a2f
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-16 15:22:27 +0800
Browse Files
Merge branch 'feature/cart' into 'develop' ...
3ab3f9b0
```
Feature/cart

购物车商结算修改

See merge request !33
```
by 赵彪
2015-12-16 14:48:20 +0800
Browse Files
roll back to the origin
030b7e90

by uedxwg
2015-12-16 14:31:34 +0800
Browse Files
roll back to the origin
0571838d

by uedxwg
2015-12-16 14:28:47 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c8a34a6b

by 毕凯
2015-12-16 14:28:17 +0800
Browse Files
shopping-cart -> cart
111bab9a

by 毕凯
2015-12-16 14:28:10 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
67156926

by hf
2015-12-16 14:21:39 +0800
Browse Files
code review by hf: do reset add to cart operate
aa7d2d0f

by hf
2015-12-16 14:21:26 +0800
Browse Files
'移除购物车'
531f455f

by uedxwg
2015-12-16 14:20:28 +0800
Browse Files
手机号绑定
cb0e5c5c

by xiaowei
2015-12-16 14:18:32 +0800
Browse Files
删除多余的shoppingcart目录
8406c466

by Rock Zhang
2015-12-16 14:14:33 +0800
Browse Files
'修改个人中心导航条'
5b062cff

by uedxwg
2015-12-16 14:11:10 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
3c10e80e

by Rock Zhang
2015-12-16 14:10:01 +0800
Browse Files
修改单个选取购物车商品以及全选购物车商品的接口 ...
7f92215f
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-16 14:09:32 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
98d10c8b

by hf
2015-12-16 14:04:14 +0800
Browse Files
do modify product detail page reference size
4cf5b8fe

by hf
2015-12-16 14:03:56 +0800
Browse Files
修复购物车页面样式错乱的bug
d54d5c98

by Rock Zhang
2015-12-16 13:58:02 +0800
Browse Files
移动购物车的目录结构 ...
070e02fa
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-16 13:53:11 +0800
Browse Files
添加对修改购物车商品数据以及数目接口对传递商品sku以及sku的验证 ...
ce44a166
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-16 13:27:00 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
2026abc5

by uedxwg
2015-12-16 13:11:08 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
12d49307

by hf
2015-12-16 13:06:42 +0800
Browse Files
code review by hf: do modify shopping cart name
b90b9cae

by hf
2015-12-16 13:06:31 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
ea528864

by Rock Zhang
2015-12-16 12:28:09 +0800
Browse Files
添加增减购物车商品数量的接口 ...
84d25186
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-16 12:27:39 +0800
Browse Files
移动购物车shoppingcart到一个单独的cart模块
63442ee1

by Rock Zhang
2015-12-16 12:07:47 +0800
Browse Files
添加当购物车商品为空时不能进入购物车结算页的逻辑
33135acb

by Rock Zhang
2015-12-16 12:07:34 +0800
Browse Files
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
d2121f58

by uedxwg
2015-12-16 11:41:00 +0800
Browse Files
'upadet'
c84f5fb5

by uedxwg
2015-12-16 11:40:51 +0800
Browse Files
购物车失效赠品商品添加标志
c507f262

by 梁志锋
2015-12-16 11:39:17 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e236e7ed

by 毕凯
2015-12-16 11:39:11 +0800
Browse Files
订单详情页面底部和查看物流问题修改
9f0f4137

by 毕凯
2015-12-16 11:39:04 +0800
Browse Files
购物车失效赠品商品添加标志
34f55e90

by 梁志锋
2015-12-16 11:38:40 +0800
Browse Files
订单详情页面代发货不显示查看物流
420da11c

by 毕凯
2015-12-16 11:38:25 +0800
Browse Files
订单详情页面底部不需要固定
9f89b6d8

by 毕凯
2015-12-16 11:28:28 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
5cfd01eb

by Rock Zhang
2015-12-16 11:26:28 +0800
Browse Files
code review by hf: do modify shopping cart name
5682930b

by hf
2015-12-16 11:26:10 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
446b030f

by Rock Zhang
2015-12-16 11:24:00 +0800
Browse Files
有货购物车商品，加价购商品以及赠品数据的接口处理逻辑 ...
ec2c30e1
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-16 11:23:28 +0800
Browse Files
购物车模板错位
74ae65fd

by 毕凯
2015-12-16 11:06:46 +0800
Browse Files