wangshusheng / YOHOBUYPC · Commits

15 Dec, 2015

40 commits

修复购物车结算页面一些样式显示以及数据交互的问题 ...
eb3592f7
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-15 21:18:11 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
6f677cad

by Rock Zhang
2015-12-15 19:07:13 +0800
Browse Files
'解决冲突'
78d482c7

by uedxwg
2015-12-15 18:19:09 +0800
Browse Files
'购物车为空，展示页面'
62442b4b

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

by Rock Zhang
2015-12-15 17:34:29 +0800
Browse Files
增加地址选择默认值
f3ce62dc

by 毕凯
2015-12-15 17:33:24 +0800
Browse Files
增加地址选择默认值
4a6fd933

by 毕凯
2015-12-15 17:33:02 +0800
Browse Files
修复结算提交接口缺失参数的bug，修复接口传参书写错误的bug ...
23eba12b
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-15 17:32:35 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
41e2ae08

by Rock Zhang
2015-12-15 17:05:54 +0800
Browse Files
修复结算提交的返回有误的bug
7072694c

by Rock Zhang
2015-12-15 17:04:43 +0800
Browse Files
购物车功能开发
685d0412

by 梁志锋
2015-12-15 16:59:23 +0800
Browse Files
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into feature/cart
5de12158

by 梁志锋
2015-12-15 16:53:26 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
ec0bfcb0

by Lynnic
2015-12-15 16:46:55 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
5f76db06

by 周少峰
2015-12-15 16:46:37 +0800
Browse Files
绑定手机号
212623b5

by xiaowei
2015-12-15 16:46:08 +0800
Browse Files
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart
b5a0377a

by Lynnic
2015-12-15 16:45:48 +0800
Browse Files
删除调试代码
f0fc7443

by Rock Zhang
2015-12-15 16:45:47 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
ee6c73e8

by Lynnic
2015-12-15 16:44:49 +0800
Browse Files
购物车弹出框 --code reviewed by LZF
efc815b7

by Lynnic
2015-12-15 16:44:28 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
553a94ca

by Rock Zhang
2015-12-15 16:38:00 +0800
Browse Files
添加格式化购物车商品，格式化加价购商品辅助函数，添加对商品的数据格式处理 ...
33e7e044
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-15 16:36:18 +0800
Browse Files
motice 报错
74ba6221

by 周少峰
2015-12-15 16:35:43 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/sefon-coin
76ba3ab6

by 周少峰
2015-12-15 16:28:26 +0800
Browse Files
发票信息修正
41666258

by 毕凯
2015-12-15 16:23:43 +0800
Browse Files
发票和留言信息记录
2cec2d4c

by 毕凯
2015-12-15 16:07:43 +0800
Browse Files
发票和留言信息记录
5c872d46

by 毕凯
2015-12-15 16:07:22 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
7b1c5acd

by Rock Zhang
2015-12-15 14:43:59 +0800
Browse Files
修复模板书写错误导致模板引擎渲染错误导致的bug ...
61cf76ce
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-15 14:30:57 +0800
Browse Files
增加订单价格计算，订单提交 @张振
e2bba535

by 毕凯
2015-12-15 14:01:14 +0800
Browse Files
增加订单提交
aae01775

by 毕凯
2015-12-15 14:00:26 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
3b881fd5

by uedxwg
2015-12-15 13:47:10 +0800
Browse Files
冲突修改
59e9d432

by uedxwg
2015-12-15 13:46:40 +0800
Browse Directory »
绑定手机号
0d71d35a

by xiaowei
2015-12-15 13:33:22 +0800
Browse Files
订单确认增加价格价格计算
e452f7fe

by 毕凯
2015-12-15 13:26:48 +0800
Browse Files
update
6e61bc02

by uedxwg
2015-12-15 13:21:07 +0800
Browse Directory »
有货币消费记录
e7a0366e

by uedxwg
2015-12-15 13:18:34 +0800
Browse Directory »
Merge branch 'cart' into 'feature/cart' ...
bfbfebb7
```
  购物车样式更新

根据设计图更新购物车样式

See merge request !24
```
by 梁志锋
2015-12-15 12:31:03 +0800
Browse Files
update for change the cart style. code review by LZF
5f003c62

by biao
2015-12-15 12:26:02 +0800
Browse Files
显示加价购和赠品
aa1323eb

by Rock Zhang
2015-12-15 10:59:09 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
c4dce4b0

by Rock Zhang
2015-12-15 10:52:54 +0800
Browse Files