fe / YOHOBUYPC · Commits

21 Dec, 2015

40 commits

优惠券名称特别长修复
f366c2b2

by 毕凯
2015-12-21 14:55:08 +0800
Browse Files
留言框样式
5288e7be

by 毕凯
2015-12-21 14:43:12 +0800
Browse Files
优化异步接口调用
2b8893a9

by 毕凯
2015-12-21 14:39:46 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e2463ddf

by 毕凯
2015-12-21 14:35:39 +0800
Browse Files
YOHO 币使用优化
4c20d207

by 毕凯
2015-12-21 14:35:32 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
2d9c014b

by 梁志锋
2015-12-21 14:34:45 +0800
Browse Files
购物车颜色切换时换图片的bug修复 code review by xieweiguang
8c1c578a

by 梁志锋
2015-12-21 14:34:33 +0800
Browse Files
code review by hf: fixes bug refs YW-1810
a3c703e1

by hf
2015-12-21 14:30:31 +0800
Browse Files
code review by hf: fixes bug refs YW-1810
96a58d9d

by hf
2015-12-21 14:27:51 +0800
Browse Files
code review by hf: fixes bug refs YW-1810
eca3e9d2

by hf
2015-12-21 14:09:43 +0800
Browse Files
添加vip价格的标志位
9e6e8ba5

by Rock Zhang
2015-12-21 13:55:24 +0800
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
7b7a8ea6

by Rock Zhang
2015-12-21 13:44:27 +0800
Browse Files
修复结算页面赠品的价格显示（显示为0.00）
7c1f68e5

by Rock Zhang
2015-12-21 13:44:22 +0800
Browse Files
code review by hf: fixes bug refs YW-1815 bind mobile check phone format
688878cb

by hf
2015-12-21 13:34:49 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
8e095efe

by 梁志锋
2015-12-21 13:23:50 +0800
Browse Files
购物车修改
d78dee45

by 梁志锋
2015-12-21 13:23:39 +0800
Browse Files
修复结算页YOHO币显示的bug ...
982abb3e
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-21 13:18:27 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
69576ba4

by Rock Zhang
2015-12-21 13:07:39 +0800
Browse Files
fixed confilct. code review by BiKai
08580b2e

by biao
2015-12-21 12:03:31 +0800
Browse Files
Merge branch 'zhaobiao/yohobuy-fix/issue' into develop
557633ba

by biao
2015-12-21 11:59:54 +0800
Browse Files
remove console.log code. code review by XWG
5c4f0abb

by biao
2015-12-21 11:57:40 +0800
Browse Files
fix the issue of scroll bar show when there is no scroll. code review by XWG
98e48ea6

by biao
2015-12-21 11:54:26 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
1fcfb524

by 毕凯
2015-12-21 11:52:33 +0800
Browse Files
优惠券显示不可用优惠券
8dce36ff

by 毕凯
2015-12-21 11:52:28 +0800
Browse Files
Merge branch 'develop' into test ...
60c294aa
```
Conflicts:
	library/Api/Yohobuy.php
```
by Rock Zhang
2015-12-21 11:44:17 +0800
Browse Directory »
修改为测试环境地址接口
a23629df

by Rock Zhang
2015-12-21 11:43:00 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/issue
9f641fbf

by biao
2015-12-21 11:42:27 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
04fa0e02

by Rock Zhang
2015-12-21 11:42:01 +0800
Browse Files
YOHO 币抵用金额变化
75860055

by 毕凯
2015-12-21 11:32:31 +0800
Browse Files
加价购商品可以勾选
60bfe392

by Rock Zhang
2015-12-21 11:30:01 +0800
Browse Directory »
update to use pure js to fix the coupin image. code review by XWG
be748850

by biao
2015-12-21 11:28:45 +0800
Browse Files
YOHO 币已抵可低
5d3666b9

by 毕凯
2015-12-21 11:26:11 +0800
Browse Files
update to fix below issues: 1. request recommand for you only when there is no g… ...
ca7f2770
```
…ood in cart. 2. the coupon img could be left up when input focused. code review by XWG.
```
by biao
2015-12-21 11:15:55 +0800
Browse Files
update to fix below issues: 1. request recommand for you only when there is no g… ...
d8188806
```
…ood in cart. 2. the coupon img could be left up when input focused. code review by XWG.
```
by biao
2015-12-21 11:15:39 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/issue
de935d72

by biao
2015-12-21 11:13:17 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
67fdef2c

by Rock Zhang
2015-12-21 10:41:12 +0800
Browse Files
merge code
f0edaaeb

by 毕凯
2015-12-21 10:37:11 +0800
Browse Files
顺丰快递点击不支持的时候不选中
06adccec

by 毕凯
2015-12-21 10:36:53 +0800
Browse Files
Merge branch 'develop' into 'develop' ...
f864a823
```
Develop

购物车数量选择修改

See merge request !49
```
by 赵彪
2015-12-21 10:35:10 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
68dd1d29

by Rock Zhang
2015-12-21 10:26:16 +0800
Browse Directory »