fe / YOHO-ACTIVITY-PHP · Commits

16 Dec, 2015

40 commits

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

by hf
2015-12-16 18:09:00 +0800
Browse Files
code review by hf: do modify product detail page
df118cce

by hf
2015-12-16 18:08:47 +0800
Browse Files
购物车类型的设置
289e1aef

by 梁志锋
2015-12-16 17:49:17 +0800
Browse Files
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into develop
6a66e15c

by 梁志锋
2015-12-16 17:14:23 +0800
Browse Files
添加加价购商品的promotionId
4873700f

by Rock Zhang
2015-12-16 17:13:40 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
ef54ac7b

by Rock Zhang
2015-12-16 16:59:10 +0800
Browse Files
添加加价购、商品详情以及赠品的模板返回路由 ...
b9766af7
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-16 16:58:24 +0800
Browse Files
提取出购物车商品、加价购商品以及赠品详情的处理逻辑
f26bc329

by Rock Zhang
2015-12-16 16:58:14 +0800
Browse Files
购物车路由修改
8eee9974

by 梁志锋
2015-12-16 16:41:54 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
021a15af

by 梁志锋
2015-12-16 16:36:05 +0800
Browse Files
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into develop
62cac7f7

by 梁志锋
2015-12-16 16:35:44 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
59d271e8

by hf
2015-12-16 16:28:01 +0800
Browse Files
code review by hf: do reset add to cart operate
d7a98aba

by hf
2015-12-16 16:27:08 +0800
Browse Files
shopping-cart -> cart
7a87d814

by 毕凯
2015-12-16 16:10:20 +0800
Browse Files
加价购价格大小
9e699c41

by 毕凯
2015-12-16 16:09:02 +0800
Browse Files
加价购样式
d6f568c1

by 毕凯
2015-12-16 16:03:40 +0800
Browse Files
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
ab82c6a8

by 毕凯
2015-12-16 15:58:08 +0800
Browse Files
加价购样式
34917e26

by 毕凯
2015-12-16 15:57:58 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
214a69c6

by Rock Zhang
2015-12-16 15:48:06 +0800
Browse Files
修改购物车商品为空时进入结算页跳转页的地址 ...
9594af85
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-16 15:47:14 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
02f38062

by hf
2015-12-16 15:33:41 +0800
Browse Files
do fixes bug to login errors
51851c15

by hf
2015-12-16 15:33:32 +0800
Browse Files
Merge branch 'fix/cart' into 'feature/cart' ...
d9a14899
```
购物车样式修改

1. 新增实效、赠品、加价购标签
2. 订购数字位置调整
3. 整体样式优化

See merge request !34
```
by 梁志锋
2015-12-16 15:32:51 +0800
Browse Files
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
shopping -> cart
c1a0e401

by 毕凯
2015-12-16 15:09:22 +0800
Browse Files
shopping -> cart
9e2139ec

by 毕凯
2015-12-16 15:07:24 +0800
Browse Files
增加加价购页面
27ac04fa

by 毕凯
2015-12-16 15:03:51 +0800
Browse Files
合并代码
2f10aeb0

by 毕凯
2015-12-16 14:50:15 +0800
Browse Files
shopping-cart -> cart
afcbea37

by 毕凯
2015-12-16 14:49:12 +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
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into fix/cart
7839b175

by biao
2015-12-16 14:41:12 +0800
Browse Files
update style for shopping cart
4f229e65

by biao
2015-12-16 14:37:37 +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