wangshusheng / YOHOBUYPC · Commits

16 Dec, 2015

40 commits

resolve confilct
9ac948a2

by biao
2015-12-16 20:04:34 +0800
Browse Files
update for select all feature for cart. code review by LZF
f09aea1c

by biao
2015-12-16 20:00:16 +0800
Browse Files
update for select all feature for cart. code review by LZF
21e9bc4f

by biao
2015-12-16 19:59:56 +0800
Browse Files
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
5ef04dc4

by 毕凯
2015-12-16 19:16:27 +0800
Browse Files
订单页面增加客服电话
2b532f38

by 毕凯
2015-12-16 19:16:15 +0800
Browse Files
取消订单进入订单列表页面
66bf855d

by 毕凯
2015-12-16 19:00:34 +0800
Browse Directory »
Merge branch 'fix/cart' into 'feature/cart' ...
af4b8c6c
```
修复模版错乱问题

See merge request !35
```
by 梁志锋
2015-12-16 18:26:04 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
52a902cf

by Lynnic
2015-12-16 18:19:47 +0800
Browse Files
购物车逻辑修改
e4fd9e83

by Lynnic
2015-12-16 18:19:26 +0800
Browse Files
购物车逻辑修改
a8e51496

by Lynnic
2015-12-16 18:03:47 +0800
Browse Files
增加购物车类型
adfb5e4c

by 毕凯
2015-12-16 18:02:22 +0800
Browse Files
合并代码
57833dbf

by 毕凯
2015-12-16 17:56:32 +0800
Browse Files
修改赠品字段名
e54acd26

by 毕凯
2015-12-16 17:53:04 +0800
Browse Files
购物车类型的设置
289e1aef

by 梁志锋
2015-12-16 17:49:17 +0800
Browse Files
增加容错处理
64f4559e

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

by 毕凯
2015-12-16 17:19:52 +0800
Browse Files
修改获取加价购商品详情storage_sum不存在报错的bug
2c9c4e47

by Rock Zhang
2015-12-16 17:19:29 +0800
Browse Files
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
28232d8d

by 毕凯
2015-12-16 17:16:41 +0800
Browse Files
加价购增加信息读取
329c5749

by 毕凯
2015-12-16 17:16:29 +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
update for fix the template issue. code review by LZF
7f54813a

by biao
2015-12-16 16:52:46 +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 git.dev.yoho.cn:web/yohobuy into feature/cart
0f1fbac9

by Lynnic
2015-12-16 16:34:51 +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
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
488f22a0

by Lynnic
2015-12-16 16:10:59 +0800
Browse Files
购物车逻辑修改
5f046a16

by Lynnic
2015-12-16 16:10:33 +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