Commits · 62cac7f701c2fc47d1956abbb7b4ba5a6216f029 · wangshusheng / YOHOBUYPC · GitLab

62cac7f701c2fc47d1956abbb7b4ba5a6216f029

16 Dec, 2015

28 commits

Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into develop
62cac7f7

by 梁志锋
9 years ago
Browse Files
shopping-cart -> cart
7a87d814

by 毕凯
9 years ago
Browse Files
加价购样式
d6f568c1

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

by 毕凯
9 years ago
Browse Files
加价购样式
34917e26

by 毕凯
9 years ago
Browse Files
Merge branch 'fix/cart' into 'feature/cart' ...
d9a14899
```
购物车样式修改

1. 新增实效、赠品、加价购标签
2. 订购数字位置调整
3. 整体样式优化

See merge request !34
```
by 梁志锋
9 years ago
Browse Files
shopping -> cart
c1a0e401

by 毕凯
9 years ago
Browse Files
shopping -> cart
9e2139ec

by 毕凯
9 years ago
Browse Files
合并代码
2f10aeb0

by 毕凯
9 years ago
Browse Files
Merge branch 'feature/cart' into 'develop' ...
3ab3f9b0
```
Feature/cart

购物车商结算修改

See merge request !33
```
by 赵彪
9 years ago
Browse Files
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into fix/cart
7839b175

by biao
9 years ago
Browse Files
update style for shopping cart
4f229e65

by biao
9 years ago
Browse Directory »
roll back to the origin
030b7e90

by uedxwg
9 years ago
Browse Files
roll back to the origin
0571838d

by uedxwg
9 years ago
Browse Files
shopping-cart -> cart
111bab9a

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

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

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

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

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

by uedxwg
9 years ago
Browse Files
购物车失效赠品商品添加标志
c507f262

by 梁志锋
9 years ago
Browse Files
购物车失效赠品商品添加标志
34f55e90

by 梁志锋
9 years ago
Browse Files
订单详情页面底部不需要固定
9f89b6d8

by 毕凯
9 years ago
Browse Directory »
code review by hf: do gulp ge to gzip css and js
66005fbf

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

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

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

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

by hf
9 years ago
Browse Directory »

15 Dec, 2015

12 commits

购物车功能
e992e267

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

by 梁志锋
9 years ago
Browse Directory »
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 Directory »
购物车功能
4a034d77

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

by biao
9 years ago
Browse Files
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 Directory »
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
4b72d481

by Lynnic
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
购物车功能
da7a41e2

by 梁志锋
9 years ago
Browse Files