fe / YOHOBUYWAP · Commits

14 Dec, 2015

1 commit

修改购物车结算页面的一些接口 ...
321a0382
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-14 15:57:03 +0800
Browse Files

12 Dec, 2015

7 commits

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart ...
e8e319d0
```
Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/ShoppingCart.php
	yohobuy/m.yohobuy.com/application/models/Index/Cart.php
```
by Rock Zhang
2015-12-12 17:03:35 +0800
Browse Files
增加发票
9948fd55

by 毕凯
2015-12-12 15:17:58 +0800
Browse Files
增加发票选择
b5cd57f4

by 毕凯
2015-12-12 15:14:24 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e7185240

by 毕凯
2015-12-12 14:20:09 +0800
Browse Files
添加优惠券搜索
cf6a1ea0

by 毕凯
2015-12-12 14:19:58 +0800
Browse Files
添加优惠券搜索
8a83f9eb

by 毕凯
2015-12-12 14:18:31 +0800
Browse Directory »
添加优惠券搜索
a68cc5af

by 毕凯
2015-12-12 14:17:56 +0800
Browse Directory »

11 Dec, 2015

12 commits

添加购物车结算页面的接口逻辑
e97cdd44

by Rock Zhang
2015-12-11 18:32:10 +0800
Browse Directory »
do order detail call api render template
af27abf6

by hf
2015-12-11 18:30:07 +0800
Browse Directory »
do order detail call api render template
d1dcd755

by hf
2015-12-11 18:28:09 +0800
Browse Files
下单确认添加使用新优惠券
a58ff0a1

by 毕凯
2015-12-11 18:26:11 +0800
Browse Directory »
提出价格处理函数；修改获取优惠券接口，能单独返回总数
5529cb24

by Rock Zhang
2015-12-11 17:51:13 +0800
Browse Directory »
code review by liangzhifeng
f8c98c9f

by 毕凯
2015-12-11 16:20:41 +0800
Browse Directory »
下单流程增加优惠券页面
a1f32bc0

by 毕凯
2015-12-11 16:10:00 +0800
Browse Directory »
下单流程增加优惠券页面
87693759

by 毕凯
2015-12-11 16:09:54 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
9c6dc1e9

by Rock Zhang
2015-12-11 14:17:01 +0800
Browse Directory »
修复首页背景图错误的bug ...
1019cf46
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-11 11:44:28 +0800
Browse Directory »
下单流程增加地址选择
cbcadfef

by 毕凯
2015-12-11 11:36:57 +0800
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
2184b8ab

by Rock Zhang
2015-12-11 11:30:59 +0800
Browse Files

10 Dec, 2015

20 commits

do format shopping cart
65cf1efc

by hf
2015-12-10 20:18:30 +0800
Browse Files
do format shopping cart
3a2684a9

by hf
2015-12-10 20:06:10 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
f147c448

by Rock Zhang
2015-12-10 19:37:39 +0800
Browse Directory »
添加部分购物车结算页面的接口”
488b0134

by Rock Zhang
2015-12-10 19:37:17 +0800
Browse Directory »
do format shopping cart
e06cd43b

by hf
2015-12-10 18:08:54 +0800
Browse Directory »
do modify huodong christmas coupon share content
eaf1b55c

by hf
2015-12-10 18:05:04 +0800
Browse Directory »
do modify huodong christmas coupon share content
dcdb19cf

by hf
2015-12-10 17:55:07 +0800
Browse Directory »
do modify huodong christmas coupon share content
d5c68c1c

by hf
2015-12-10 17:54:07 +0800
Browse Files
do modify huodong christmas coupon share content
c78fee2b

by hf
2015-12-10 17:45:25 +0800
Browse Directory »
修复修改购物车商品信息接口的bug
a752f6ed

by Rock Zhang
2015-12-10 17:38:12 +0800
Browse Files
format shopping cart
fa4606a9

by hf
2015-12-10 17:36:14 +0800
Browse Files
format shopping cart
fc0e3df6

by hf
2015-12-10 17:13:23 +0800
Browse Directory »
do merge ActivityData.php
eefba98d

by hf
2015-12-10 16:53:30 +0800
Browse Directory »
do merge ActivityData.php
7b0c73a0

by hf
2015-12-10 16:50:53 +0800
Browse Directory »
do merge huodong newuser coupon code
ac45cb89

by hf
2015-12-10 16:11:45 +0800
Browse Directory »
Merge branch 'master' into develop
100d30af

by hf
2015-12-10 16:02:07 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c6226746

by hf
2015-12-10 15:52:44 +0800
Browse Files
do add huodong coupon christmas and newuser
49d7cff3

by hf
2015-12-10 15:09:11 +0800
Browse Directory »
do add huodong coupon christmas and newuser
eeb53281

by hf
2015-12-10 15:07:31 +0800
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
304df337

by Rock Zhang
2015-12-10 14:25:36 +0800
Browse Files