fe / YOHOBUYPC · Commits

21 Dec, 2015

40 commits

修复加价购和赠品价格的显示逻辑（改成last_price） ...
f39a7285
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-21 23:49:24 +0800
Browse Directory »
merge code
8d6278f0

by 毕凯
2015-12-21 23:29:16 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
eb8edec9

by 毕凯
2015-12-21 23:27:11 +0800
Browse Directory »
返回顶部触发修改
69cd52dc

by 毕凯
2015-12-21 23:27:05 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
d71120ea

by 梁志锋
2015-12-21 23:23:51 +0800
Browse Directory »
购物车修改
e124bdea

by 梁志锋
2015-12-21 23:23:34 +0800
Browse Directory »
购物车修改
09c83f23

by 梁志锋
2015-12-21 23:23:27 +0800
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
9b29c86c
```
Conflicts:
	static/js/cart/order-ensure.js
```
by Rock Zhang
2015-12-21 23:11:14 +0800
Browse Directory »
购物车修改
52b221f1

by 梁志锋
2015-12-21 23:07:05 +0800
Browse Files
修改结算页顺丰地址不支持地区的判定逻辑 ...
7bd1f0f2
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-21 23:06:55 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c870248c

by 梁志锋
2015-12-21 23:05:21 +0800
Browse Directory »
购物车修改
889942d9

by 梁志锋
2015-12-21 23:05:00 +0800
Browse Files
Merge branch 'fix/issue' into 'develop' ...
508338b1
```
修复问题

1. 修复购物车页面为你优选不显示问题
2. 增加未选择赠品时去结算前的提醒

See merge request !62
```
by weiguang.xie
2015-12-21 23:01:46 +0800
Browse Files
Merge branch 'develop' into 'develop' ...
07a98538
```
Develop

1:购物车商品为零时不显示
2:帮助中心详情优化
3:赠品显示原价

See merge request !61
```
by 赵彪
2015-12-21 22:55:58 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/issue
5b533e16

by biao
2015-12-21 22:54:04 +0800
Browse Directory »
增加未选择赠品时去结算的提醒. code review by XWG
837d1b4f

by biao
2015-12-21 22:53:13 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c9595bba

by uedxwg
2015-12-21 22:46:42 +0800
Browse Directory »
'update'
a2d16ddb

by uedxwg
2015-12-21 22:46:27 +0800
Browse Directory »
选择优惠券优化
21f407a0

by 毕凯
2015-12-21 22:38:58 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
004ac423

by 毕凯
2015-12-21 22:22:28 +0800
Browse Files
订单确认输入框字体大小
f3ad7ced

by 毕凯
2015-12-21 22:22:22 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
0120cd56

by uedxwg
2015-12-21 22:20:36 +0800
Browse Directory »
'update'
eaf99168

by uedxwg
2015-12-21 22:20:23 +0800
Browse Directory »
code review by hf: fixes some bugs to help detail page
ad7668f8

by hf
2015-12-21 22:12:07 +0800
Browse Directory »
code review by hf: fixes some bugs to help detail page
1103937c

by hf
2015-12-21 22:09:37 +0800
Browse Directory »
不同时提交订单
0135885e

by 毕凯
2015-12-21 22:01:04 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
878b8020

by 毕凯
2015-12-21 21:49:17 +0800
Browse Files
订单确认禁止表单提交
b7ea878c

by 毕凯
2015-12-21 21:49:12 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
6c3d2e82

by 梁志锋
2015-12-21 21:47:36 +0800
Browse Files
购物车修改
081d551b

by 梁志锋
2015-12-21 21:47:18 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
57686f03

by 毕凯
2015-12-21 21:35:41 +0800
Browse Files
优惠券列表
9f383aaa

by 毕凯
2015-12-21 21:35:37 +0800
Browse Directory »
Merge branch 'develop' into 'develop' ...
bf1d0c20
```
Develop

1：加价购商品添加原价

See merge request !60
```
by 赵彪
2015-12-21 21:33:24 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e3c851e8

by uedxwg
2015-12-21 21:29:55 +0800
Browse Directory »
'加价购赠品修改'
b7bd799f

by uedxwg
2015-12-21 21:29:39 +0800
Browse Files
tab switch in cart
31c0d15c

by 毕凯
2015-12-21 21:07:31 +0800
Browse Files
'update'
9b4abbf9

by uedxwg
2015-12-21 20:56:39 +0800
Browse Files
'加价购商品添加原价'
de408757

by uedxwg
2015-12-21 20:53:46 +0800
Browse Directory »
fix issue of recommand for you did not show on cart page. code review by XWG
07031cc4

by biao
2015-12-21 20:42:23 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e9c6aba1

by uedxwg
2015-12-21 20:23:56 +0800
Browse Directory »