fe / YOHOBUYPC · Commits

15 Dec, 2015

40 commits

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
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
解决冲突-帮助列表，详情
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
modify the showYohood default data
56055660

by biao
2015-12-15 18:11:04 +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
update for channel page. code review by HongFei
3cacdc5d

by biao
2015-12-15 18:03:18 +0800
Browse Files
update
a177b827

by biao
2015-12-15 17:56:08 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into bind
a87499b4

by biao
2015-12-15 17:47:48 +0800
Browse Files
update for channel page. code review by HongFei
d31acf6f

by biao
2015-12-15 17:47:43 +0800
Browse Files
增加地址选择默认值
f3ce62dc

by 毕凯
2015-12-15 17:33:24 +0800
Browse Files
增加地址选择默认值
4a6fd933

by 毕凯
2015-12-15 17:33:02 +0800
Browse Files
修复结算提交接口缺失参数的bug，修复接口传参书写错误的bug ...
23eba12b
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-15 17:32:35 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
41e2ae08

by Rock Zhang
2015-12-15 17:05:54 +0800
Browse Files
修复结算提交的返回有误的bug
7072694c

by Rock Zhang
2015-12-15 17:04:43 +0800
Browse Files
购物车功能开发
685d0412

by 梁志锋
2015-12-15 16:59:23 +0800
Browse Files
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
5de12158

by 梁志锋
2015-12-15 16:53:26 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
ec0bfcb0

by Lynnic
2015-12-15 16:46:55 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
5f76db06

by 周少峰
2015-12-15 16:46:37 +0800
Browse Files
绑定手机号
212623b5

by xiaowei
2015-12-15 16:46:08 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
b5a0377a

by Lynnic
2015-12-15 16:45:48 +0800
Browse Files
删除调试代码
f0fc7443

by Rock Zhang
2015-12-15 16:45:47 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
ee6c73e8

by Lynnic
2015-12-15 16:44:49 +0800
Browse Files
购物车弹出框 --code reviewed by LZF
efc815b7

by Lynnic
2015-12-15 16:44:28 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
553a94ca

by Rock Zhang
2015-12-15 16:38:00 +0800
Browse Files
添加格式化购物车商品，格式化加价购商品辅助函数，添加对商品的数据格式处理 ...
33e7e044
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-15 16:36:18 +0800
Browse Files
motice 报错
74ba6221

by 周少峰
2015-12-15 16:35:43 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/sefon-coin
76ba3ab6

by 周少峰
2015-12-15 16:28:26 +0800
Browse Files