fe / YOHO-ACTIVITY-PHP · Commits

14 Dec, 2015

40 commits

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
716f42ea

by Rock Zhang
2015-12-14 16:24:46 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
65526daf

by 梁志锋
2015-12-14 16:21:28 +0800
Browse Files
添加购物车结算页面修改属性时重新运算的路由接口 ...
402bea46
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-14 16:21:02 +0800
Browse Files
yas版本升级
9275e082

by 梁志锋
2015-12-14 16:20:07 +0800
Browse Files
yas版本升级
e00b5819

by 梁志锋
2015-12-14 16:19:52 +0800
Browse Files
yas版本升级
5b5f2a78

by 梁志锋
2015-12-14 16:11:17 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart ...
dae67e29
```
Conflicts:
	library/LibModels/Wap/Home/CartData.php
	yohobuy/m.yohobuy.com/application/controllers/ShoppingCart.php
	yohobuy/m.yohobuy.com/application/models/Index/Cart.php
```
by Rock Zhang
2015-12-14 16:03:57 +0800
Browse Files
修改购物车结算页面的一些接口 ...
321a0382
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-14 15:57:03 +0800
Browse Files
提交yas版本的修改
586a6de1

by 梁志锋
2015-12-14 15:55:26 +0800
Browse Files
Merge branch 'bind' into 'develop' ...
387f039b
```
频道选择页修改

1. 可选频道通过后台配置
2. 增加yohood频道

See merge request !23
```
by 梁志锋
2015-12-14 15:30:18 +0800
Browse Files
修改 orderInfo 用法
99ece4ed

by 毕凯
2015-12-14 15:05:36 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
91d0aa3e

by 毕凯
2015-12-14 14:52:06 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
b44b8bff

by uedxwg
2015-12-14 14:49:06 +0800
Browse Files
后台协商之后调整部分输出 @ 赵彪
535d25d5

by uedxwg
2015-12-14 14:45:26 +0800
Browse Files
code review by liangzhifeng
674bc2cf

by 毕凯
2015-12-14 14:44:18 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
66231a81

by 毕凯
2015-12-14 14:43:53 +0800
Browse Files
选择地址增加地址修改
2cf61e7b

by 毕凯
2015-12-14 14:43:05 +0800
Browse Files
code reviewed by LZF
dc995419

by Lynnic
2015-12-14 14:40:08 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/detailFix
473e5a17

by Lynnic
2015-12-14 14:26:03 +0800
Browse Files
数据结构修改
e951c564

by Lynnic
2015-12-14 14:25:44 +0800
Browse Files
商品详情页评价列表页面修改 -- code reviewed LiangZhifeng
c858cb1c

by Lynnic
2015-12-14 14:15:44 +0800
Browse Files
帮助中心列表
6b5585d0

by cailing
2015-12-14 14:03:56 +0800
Browse Files
update data-structure.md for channel page
f31010e6

by biao
2015-12-14 14:03:54 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into bind
a0be1a20

by biao
2015-12-14 13:56:09 +0800
Browse Files
update channel page to make the channels can be configed and add yohood channel … ...
f4b4ec22
```
…for this page. code review by LZF
```
by biao
2015-12-14 13:55:44 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
f7622c00

by uedxwg
2015-12-14 13:47:50 +0800
Browse Files
帮助中心，帮助详情
9abda0cb

by uedxwg
2015-12-14 13:47:21 +0800
Browse Files
do modify product detail page call comments list api to old
41376416

by hf
2015-12-14 13:45:14 +0800
Browse Files
do modify product detail page call comments list api to old
f5e0d496

by hf
2015-12-14 13:44:13 +0800
Browse Files
do modify product detail page call comments list api to old
3c2e1cd0

by HF
2015-12-14 13:41:35 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e5f28169

by 毕凯
2015-12-14 13:26:26 +0800
Browse Files
订单确认优化
deed9b35

by 毕凯
2015-12-14 13:26:16 +0800
Browse Files
修改优惠券使用方式
90fd01a4

by 毕凯
2015-12-14 12:05:07 +0800
Browse Files
do modify product detail page commentsUrl and consultsUrl named
2a4f4e6e

by HF
2015-12-14 11:58:10 +0800
Browse Files
do modify product detail page commentsUrl and consultsUrl named
2cf8a02d

by HF
2015-12-14 11:55:05 +0800
Browse Files
修改输入优惠券号码直接使用
41d8c009

by 毕凯
2015-12-14 11:05:41 +0800
Browse Files
跳转绑定手机号
8d6b5e32

by xiaowei
2015-12-14 11:01:30 +0800
Browse Files
订单确认增加留言
82939c63

by 毕凯
2015-12-14 10:39:48 +0800
Browse Files
init bind page. code review by XWG
23cbabb6

by biao
2015-12-14 09:58:28 +0800
Browse Files
init bind page. code review by XWG
0a682149

by biao
2015-12-14 09:57:57 +0800
Browse Files