fe / YOHO-ACTIVITY-PHP · Commits

15 Dec, 2015

40 commits

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

by xiaowei
2015-12-15 21:25:59 +0800
Browse Files
手机绑定
cd907d99

by xiaowei
2015-12-15 21:25:50 +0800
Browse Files
Merge branch 'feature/cart' into develop
ff4dc719

by Rock Zhang
2015-12-15 21:19:19 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
6629b988

by Rock Zhang
2015-12-15 21:18:56 +0800
Browse Files
修复购物车结算页面一些样式显示以及数据交互的问题 ...
eb3592f7
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-15 21:18:11 +0800
Browse Files
手机绑定
c3fe56e4

by xiaowei
2015-12-15 21:10:25 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
90baa97a

by xiaowei
2015-12-15 21:02:36 +0800
Browse Files
绑定手机号
c366e838

by xiaowei
2015-12-15 21:02:22 +0800
Browse Files
购物车功能开发
beb2b021

by 梁志锋
2015-12-15 20:58:41 +0800
Browse Files
购物车功能开发
23ad180a

by 梁志锋
2015-12-15 20:58:29 +0800
Browse Files
Merge branch 'feature/srollToRequest' into 'develop' ...
8c60b7f4
```
频道详情页： 为你优选在滑动后再请求

See merge request !31
```
by 梁志锋
2015-12-15 20:49:20 +0800
Browse Files
update for make the recommend-for-you be sent after scroll. code review by LZF
5d10a483

by biao
2015-12-15 20:44:24 +0800
Browse Files
update for make the recommend-for-you be sent after scroll. code review by LZF
6d5ffa9a

by biao
2015-12-15 20:40:37 +0800
Browse Files
update for make the recommend-for-you be sent after scroll. code review by LZF
9e20d4ad

by biao
2015-12-15 20:40:08 +0800
Browse Files
购物车功能开发
7bb68f4c

by 梁志锋
2015-12-15 20:25:30 +0800
Browse Files
购物车功能开发
66b3b61e

by 梁志锋
2015-12-15 20:17:10 +0800
Browse Files
购物车功能开发
c1cd7cc8

by 梁志锋
2015-12-15 20:16:40 +0800
Browse Files
Merge branch 'bind' into 'develop' ...
80ea5de3
```
频道选择页更改

1. 增加yohood频道
2. 频道选择项可配置

See merge request !30
```
by fei.hong
2015-12-15 19:52:52 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
251e35ef

by Lynnic
2015-12-15 19:52:36 +0800
Browse Files
购物车面板代码修改 --code reviewed by LZF
a23c7add

by Lynnic
2015-12-15 19:52:03 +0800
Browse Files
sync Grade.php to develop branch. code revie by Hongfei
3ce23ccc

by biao
2015-12-15 19:46:32 +0800
Browse Files
update Home.php to remove unnecessary condition. code review by HongFei
7dd09f04

by biao
2015-12-15 19:44:44 +0800
Browse Files
合并代码
32f9c968

by 毕凯
2015-12-15 19:38:49 +0800
Browse Files
增加提交表单的默认值
004e0fa9

by 毕凯
2015-12-15 19:36:27 +0800
Browse Files
sync to Order.php. code review by Hongfei
0afa6457

by biao
2015-12-15 19:34:18 +0800
Browse Files
帮助中心列表页修改
d2cf27f2

by cailing
2015-12-15 19:24:57 +0800
Browse Files
修正订单确认提交数据
949118fe

by 毕凯
2015-12-15 19:23:52 +0800
Browse Files
remove the IndexData.php and Index.php
0eb14911

by biao
2015-12-15 19:20:25 +0800
Browse Files
update for re-orgnise the channel page code. code review by HongFei
36df31e4

by biao
2015-12-15 19:15:08 +0800
Browse Files
修改文件目录
0ab7b56b

by yangyang
2015-12-15 19:10:41 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
6f677cad

by Rock Zhang
2015-12-15 19:07:13 +0800
Browse Files
解决冲突-帮助列表，详情
c21d1938

by cailing
2015-12-15 19:02:36 +0800
Browse Files
帮助
016553b2

by cailing
2015-12-15 18:48:19 +0800
Browse Files
update for models of Index. code review by HongFei
2a3b7066

by biao
2015-12-15 18:42:32 +0800
Browse Files
true
0e25743c

by yangyang
2015-12-15 18:30:22 +0800
Browse Files
'解决冲突'
78d482c7

by uedxwg
2015-12-15 18:19:09 +0800
Browse Files
modify the showYohood default data
56055660

by biao
2015-12-15 18:11:04 +0800
Browse Files
'购物车为空，展示页面'
62442b4b

by uedxwg
2015-12-15 18:08:22 +0800
Browse Files
Merge branch 'feture/channel' of http://git.dev.yoho.cn/web/yohobuy into bind
d52cdc51

by biao
2015-12-15 18:07:08 +0800
Browse Files
修改数据格式
eb14de88

by yangyang
2015-12-15 18:06:11 +0800
Browse Files