chenchao / YOHOBUYPC · Commits

214a69c6f1a0402ce95b49b1d15c90c7b191293b

16 Dec, 2015

19 commits

Merge branch 'feature/cart' into 'develop' ...
3ab3f9b0
```
Feature/cart

购物车商结算修改

See merge request !33
```
by 赵彪
9 years ago
Browse Directory »
shopping-cart -> cart
111bab9a

by 毕凯
9 years ago
Browse Directory »
'移除购物车'
531f455f

by uedxwg
9 years ago
Browse Directory »
'修改个人中心导航条'
5b062cff

by uedxwg
9 years ago
Browse Directory »
修复购物车页面样式错乱的bug
d54d5c98

by Rock Zhang
9 years ago
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
2026abc5

by uedxwg
9 years ago
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
ea528864

by Rock Zhang
9 years ago
Browse Directory »
移动购物车shoppingcart到一个单独的cart模块
63442ee1

by Rock Zhang
9 years ago
Browse Directory »
添加当购物车商品为空时不能进入购物车结算页的逻辑
33135acb

by Rock Zhang
9 years ago
Browse Directory »
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
d2121f58

by uedxwg
9 years ago
Browse Directory »
'upadet'
c84f5fb5

by uedxwg
9 years ago
Browse Directory »
购物车失效赠品商品添加标志
34f55e90

by 梁志锋
9 years ago
Browse Directory »
订单详情页面代发货不显示查看物流
420da11c

by 毕凯
9 years ago
Browse Files
购物车模板错位
74ae65fd

by 毕凯
9 years ago
Browse Directory »
code review by hf: do modify shopping cart name
fca40144

by hf
9 years ago
Browse Directory »
Merge branch 'feature/cart' into develop
f794dbee

by Rock Zhang
9 years ago
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
6a8d04ef

by hf
9 years ago
Browse Files
code review by hf: do add cuxiao newuser coupon second times
cc815f2a

by hf
9 years ago
Browse Files
Merge branch 'feature/youhuiquan' into develop
fc3c466f

by hf
9 years ago
Browse Files

15 Dec, 2015

21 commits

购物车功能
dc760085

by 梁志锋
9 years ago
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
c4f013fe

by 梁志锋
9 years ago
Browse Directory »
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
116d2ea9

by 梁志锋
9 years ago
Browse Files
购物车功能
4a034d77

by 梁志锋
9 years ago
Browse Directory »
update for bind mobile. code review by LZF
f2bde703

by biao
9 years ago
Browse Files
'代码冲突修改'
8ee2d89b

by uedxwg
9 years ago
Browse Directory »
'样式冲突修改'
65a97994

by uedxwg
9 years ago
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
9 years ago
Browse Files
'购物车商品详情'
3bf0374b

by uedxwg
9 years ago
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/bindMobile
11b726ce

by biao
9 years ago
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
bc43d749

by Lynnic
9 years ago
Browse Directory »
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
0986f55a

by Rock Zhang
9 years ago
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/bindMobile
dec7737c

by biao
9 years ago
Browse Files
code review by hf: format currency and detail code
aeb961d9

by hf
9 years ago
Browse Files
购物车功能开发
a924419f

by 梁志锋
9 years ago
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart ...
1dd91415
```
Conflicts:
	docs/data-structure.md
```
by Lynnic
9 years ago
Browse Directory »
购物车面板代码修改 --code reviewed by LZF
8ac969d0

by Lynnic
9 years ago
Browse Files
修复加价购数目显示的问题，修复购物车商品价格显示的问题
4b2ea05b

by Rock Zhang
9 years ago
Browse Directory »
订单确认页面样式优化
c1456a62

by 毕凯
9 years ago
Browse Files
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
91853307

by 梁志锋
9 years ago
Browse Files
购物车功能开发
8f570b69

by 梁志锋
9 years ago
Browse Files