fe / YOHOBUYPC · Commits

21 Dec, 2015

40 commits

fixes bugs to modify analysis js to async
11d551e0

by hf
2015-12-22 00:08:14 +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 Files
增加未选择赠品时去结算的提醒. code review by XWG
837d1b4f

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

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

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

by 毕凯
2015-12-21 22:38:58 +0800
Browse Files
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 Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
0120cd56

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

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

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

by hf
2015-12-21 22:09:37 +0800
Browse Files
不同时提交订单
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 Files
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 Files
'加价购赠品修改'
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 Files
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 Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e9c6aba1

by uedxwg
2015-12-21 20:23:56 +0800
Browse Files
'update'
6158a9ba

by uedxwg
2015-12-21 20:23:31 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e3b4adec

by 梁志锋
2015-12-21 20:22:08 +0800
Browse Files
加价购链接改成hammer
088997b5

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

by hf
2015-12-21 20:13:15 +0800
Browse Files
购物车商品价格显示修改
d2d99826

by Rock Zhang
2015-12-21 20:12:59 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
201b3701

by hf
2015-12-21 20:11:41 +0800
Browse Files
加价购选择 button 改 span
76b9a245

by 毕凯
2015-12-21 20:09:35 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4b15b0ed

by hf
2015-12-21 20:05:37 +0800
Browse Files
code review by hf: fixes some bugs
2d66966f

by hf
2015-12-21 20:05:25 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
88b34872

by 毕凯
2015-12-21 20:01:26 +0800
Browse Files
商品价格样式
02e8399f

by 毕凯
2015-12-21 20:01:22 +0800
Browse Files