chenchao / YOHOBUYPC · Commits

21 Dec, 2015

40 commits

code review by hf: merge master code to develop
7e62da23

by hf
2015-12-22 00:38:58 +0800
Browse Files
Merge branch 'develop' into test
2a648a91

by hf
2015-12-22 00:36:42 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
100ca0e3

by hf
2015-12-22 00:36:30 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
a3d7b4b0

by uedxwg
2015-12-22 00:31:38 +0800
Browse Files
code review by hf: merge master code ti develop
f2b1294f

by hf
2015-12-22 00:22:41 +0800
Browse Files
'购物车商品列表文字过大修改'
362d93be

by uedxwg
2015-12-22 00:21:31 +0800
Browse Files
code review by hf: merge master code ti develop
e317ad8e

by hf
2015-12-22 00:18:09 +0800
Browse Files
Merge branch 'develop' into test
86aff785

by hf
2015-12-22 00:17:38 +0800
Browse Files
code review by hf: merge master code ti develop
e48cab08

by hf
2015-12-22 00:17:29 +0800
Browse Files
code review by hf: merge master code ti develop
879f6945

by hf
2015-12-22 00:14:48 +0800
Browse Directory »
Merge branch 'develop' into test
469f59ea

by hf
2015-12-22 00:08:56 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
6b5cf522

by hf
2015-12-22 00:08:38 +0800
Browse Files
fixes bugs to modify analysis js to async
11d551e0

by hf
2015-12-22 00:08:14 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
84b1661e

by 梁志锋
2015-12-22 00:05:58 +0800
Browse Files
购物车提示框只显示一次
93675765

by 梁志锋
2015-12-22 00:05:39 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
976d5a4f

by Rock Zhang
2015-12-21 23:50:03 +0800
Browse Files
修复加价购和赠品价格的显示逻辑（改成last_price） ...
f39a7285
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-21 23:49:24 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
bbc01df3

by 毕凯
2015-12-21 23:47:40 +0800
Browse Files
绑定中优化
ad14ead3

by 毕凯
2015-12-21 23:47:33 +0800
Browse Files
Merge branch 'develop' into 'develop' ...
0dae28bb
```
Develop

1:帮助中心添加底部

See merge request !64
```
by 赵彪
2015-12-21 23:45:49 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
f1332d79

by 毕凯
2015-12-21 23:44:06 +0800
Browse Files
修改绑定手机号绑定中文字
e162365f

by 毕凯
2015-12-21 23:43:59 +0800
Browse Files
Merge branch 'fix/issue' into 'develop' ...
9317f492
```
购物车页面，添加功能：库存不足的商品禁止勾选

See merge request !63
```
by weiguang.xie
2015-12-21 23:43:19 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
7ff83240

by 梁志锋
2015-12-21 23:41:24 +0800
Browse Files
购物车修改
cf1422f9

by 梁志锋
2015-12-21 23:41:13 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
354e889f

by uedxwg
2015-12-21 23:41:06 +0800
Browse Files
'帮助中心添加底部'
c2de345f

by uedxwg
2015-12-21 23:40:45 +0800
Browse Files
resolve conflict
3be59a67

by biao
2015-12-21 23:38:42 +0800
Browse Files
禁止库存不足的商品被勾选. code review by XWG
78f52a80

by biao
2015-12-21 23:33:16 +0800
Browse Files
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 Files
返回顶部触发修改
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 Files
购物车修改
e124bdea

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

by 梁志锋
2015-12-21 23:23:27 +0800
Browse Files
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 Files
购物车修改
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 Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c870248c

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

by 梁志锋
2015-12-21 23:05:00 +0800
Browse Files