fe / YOHOBUYWAP · Commits

15 Dec, 2015

40 commits

Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
116d2ea9

by 梁志锋
2015-12-15 23:26:44 +0800
Browse Files
购物车功能
4a034d77

by 梁志锋
2015-12-15 23:26:21 +0800
Browse Files
'代码冲突修改'
8ee2d89b

by uedxwg
2015-12-15 23:10:26 +0800
Browse Files
'样式冲突修改'
65a97994

by uedxwg
2015-12-15 23:06:31 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
4b72d481

by Lynnic
2015-12-15 23:03:09 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
297a61e3

by Lynnic
2015-12-15 22:59:00 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart ...
9473d1a7
```
Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/ShoppingCart.php
```
by Lynnic
2015-12-15 22:57:45 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
b071cc8b

by hf
2015-12-15 22:57:36 +0800
Browse Files
code review by hf: do modify product detail page add to cart code
d9ce84b1

by hf
2015-12-15 22:57:28 +0800
Browse Files
购物车功能
da7a41e2

by 梁志锋
2015-12-15 22:51:17 +0800
Browse Files
'购物车商品详情'
6c00f57b

by uedxwg
2015-12-15 22:50:44 +0800
Browse Files
'购物车商品详情'
3bf0374b

by uedxwg
2015-12-15 22:50:30 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
a6abc59d

by xiaowei
2015-12-15 22:44:18 +0800
Browse Files
手机绑定
8fa27c2e

by xiaowei
2015-12-15 22:44:08 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
bc43d749

by Lynnic
2015-12-15 22:38:48 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4a6280a0

by hf
2015-12-15 22:32:10 +0800
Browse Files
code review by hf: format currency and detail code
a4adbef0

by hf
2015-12-15 22:31:58 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
0986f55a

by Rock Zhang
2015-12-15 22:29:06 +0800
Browse Directory »
添加赠品和加价购页面 ...
e6346920
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-15 22:28:34 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
48017d04

by 毕凯
2015-12-15 22:27:40 +0800
Browse Files
添加订单提交 loading
082d740b

by 毕凯
2015-12-15 22:27:33 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4ff4c3eb

by xiaowei
2015-12-15 22:25:26 +0800
Browse Directory »
手机绑定
f890891e

by xiaowei
2015-12-15 22:25:18 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
b6fb1b40

by hf
2015-12-15 22:25:09 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
08640988

by hf
2015-12-15 22:24:54 +0800
Browse Files
code review by hf: format currency and detail code
aeb961d9

by hf
2015-12-15 22:24:42 +0800
Browse Files
订单提交后清除cookies
787dc34b

by 毕凯
2015-12-15 22:24:17 +0800
Browse Files
购物车功能开发
a924419f

by 梁志锋
2015-12-15 22:19:22 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
d94ce54f

by 毕凯
2015-12-15 22:19:06 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
73c47a31

by Lynnic
2015-12-15 22:19:01 +0800
Browse Files
订单详情页删除订单优化
23fb9f17

by 毕凯
2015-12-15 22:18:59 +0800
Browse Directory »
code review by hf: format help center code
b13941cd

by hf
2015-12-15 22:08:36 +0800
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart ...
1dd91415
```
Conflicts:
	docs/data-structure.md
```
by Lynnic
2015-12-15 21:55:13 +0800
Browse Directory »
购物车面板代码修改 --code reviewed by LZF
8ac969d0

by Lynnic
2015-12-15 21:52:40 +0800
Browse Directory »
do product detail page add to cart feature
79eedd2b

by hf
2015-12-15 21:48:13 +0800
Browse Directory »
do product detail page add to cart feature
e51e9316

by hf
2015-12-15 21:47:06 +0800
Browse Directory »
修复加价购数目显示的问题，修复购物车商品价格显示的问题
4b2ea05b

by Rock Zhang
2015-12-15 21:44:14 +0800
Browse Directory »
do product detail page add to cart feature
c8fd2cff

by hf
2015-12-15 21:43:23 +0800
Browse Directory »
订单确认页面样式优化
c1456a62

by 毕凯
2015-12-15 21:42:49 +0800
Browse Directory »
do product detail page add to cart feature
b29b37ec

by hf
2015-12-15 21:41:58 +0800
Browse Directory »