fe / YOHO-ACTIVITY-PHP · Commits

16 Dec, 2015

40 commits

Merge branch 'feature/cart' into develop
1b46ae63

by 毕凯
2015-12-16 21:56:21 +0800
Browse Files
修复模板加价购和赠品模板请求接口返回的bug，需要返回模板的html代码，不能渲染 ...
12d10b4d
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-16 21:54:18 +0800
Browse Files
购物车功能开发
8de80e6e

by 梁志锋
2015-12-16 21:48:22 +0800
Browse Files
购物车功能开发
4f45ed26

by 梁志锋
2015-12-16 21:48:16 +0800
Browse Files
Merge branch 'feature/cart' into develop
e3ee1e6a

by Rock Zhang
2015-12-16 21:38:17 +0800
Browse Files
修改加价购或者赠品信息图片大小 ...
b6e4da12
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-16 21:36:56 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
a1d902d4

by hf
2015-12-16 21:33:30 +0800
Browse Files
fixes bug to product detail page recom reference
12b61e26

by hf
2015-12-16 21:33:14 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
57e3dbf3

by Lynnic
2015-12-16 21:21:11 +0800
Browse Files
购物车逻辑修改
d56e6bbe

by Lynnic
2015-12-16 21:20:41 +0800
Browse Files
Merge branch 'fix/detail' into 'develop' ...
cbd5d334
```
优化为你优选加载时机

See merge request !40
```
by 梁志锋
2015-12-16 21:20:19 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
2794cdad

by Rock Zhang
2015-12-16 21:17:42 +0800
Browse Files
添加购物车商品的select字段
c31f6a78

by Rock Zhang
2015-12-16 21:17:22 +0800
Browse Files
添加到购物车模板对应数据结构更新
d6328e4e

by 毕凯
2015-12-16 21:16:55 +0800
Browse Files
optimise the scroll for recommend for you. cdoe reveiw by LZF
f69f6100

by biao
2015-12-16 21:16:18 +0800
Browse Files
修改加价购商品显示的数目
6ca09cae

by Rock Zhang
2015-12-16 21:06:46 +0800
Browse Files
购物车功能修改
d02d1242

by 梁志锋
2015-12-16 20:54:08 +0800
Browse Files
购物车功能开发
824fc374

by 梁志锋
2015-12-16 20:51:05 +0800
Browse Files
购物车功能开发
4345c1cc

by 梁志锋
2015-12-16 20:50:58 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart ...
f0eceb99
```
Conflicts:
	static/js/cart/chose-panel.js
```
by Rock Zhang
2015-12-16 20:45:45 +0800
Browse Files
修复加价购商品详情的bug ...
914486b3
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-16 20:43:41 +0800
Browse Files
赠品加价购背景颜色
842a6561

by 毕凯
2015-12-16 20:24:44 +0800
Browse Files
增加容错处理
8966808a

by 毕凯
2015-12-16 20:22:31 +0800
Browse Files
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
2116becf

by 毕凯
2015-12-16 20:15:40 +0800
Browse Files
增加赠品页面
7c16525b

by 毕凯
2015-12-16 20:15:32 +0800
Browse Files
Merge branch 'fix/cart' into 'feature/cart' ...
d03d9587
```
购物车增加全选/全取消 功能

See merge request !39
```
by 梁志锋
2015-12-16 20:10:01 +0800
Browse Files
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
fixes bug refs YW-1678
7a7fe887

by hf
2015-12-16 19:29:23 +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 Files
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 http://git.dev.yoho.cn/web/yohobuy into feature/cart
7768455a

by 梁志锋
2015-12-16 18:25:56 +0800
Browse Files
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
09b6272c

by 梁志锋
2015-12-16 18:23:34 +0800
Browse Files
code review by hf: do fixes order detail page bugs
2d2df212

by hf
2015-12-16 18:22:49 +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
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