fe / YOHOBUYWAP · Commits

14 Jan, 2016

40 commits

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
25a34ac2

by Rock Zhang
2016-01-14 17:41:35 +0800
Browse Files
修复结算页面cokie中的cartType记录与url中的cartType不同步导致数据错误的bug ...
669eafd5
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-01-14 17:40:39 +0800
Browse Files
merge feature wap323 review by zhaobiao
f79f8d68

by 梁志锋
2016-01-14 17:37:31 +0800
Browse Files
merge feature wap323 review by zhaobiao
6336fc39

by 梁志锋
2016-01-14 17:33:01 +0800
Browse Files
merge feature wap323 review by zhaobiao
4abf20d0

by 梁志锋
2016-01-14 17:31:56 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
27f04c7b

by lore-w
2016-01-14 17:26:32 +0800
Browse Files
注册联调、字段修改 code review by liuyue
be378c40

by lore-w
2016-01-14 17:25:35 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
1f06035b

by whb
2016-01-14 17:13:20 +0800
Browse Files
Merge branch 'beta' into develop ...
c8b0fda9
```
Conflicts:
	static/js/cart/order-ensure.js
```
by Rock Zhang
2016-01-14 17:06:51 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4e554b88

by 梁志锋
2016-01-14 16:58:00 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy.git into develop
a48feb52

by whb
2016-01-14 16:45:28 +0800
Browse Files
Merge branch 'feature/web-list' of http://git.dev.yoho.cn/web/yohobuy into feature/web-list
10c35ed3

by yangyang
2016-01-14 16:19:00 +0800
Browse Files
完成new页面
f8570558

by yangyang
2016-01-14 16:17:21 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list
5899d00a

by 周少峰
2016-01-14 16:04:13 +0800
Browse Files
全部折扣重复
4c25a2b3

by 周少峰
2016-01-14 16:02:21 +0800
Browse File »
更新到201501141557静态资源
73d15daa

by Rock Zhang
2016-01-14 15:57:11 +0800
Browse Files
修改启动
e29f8398

by whb
2016-01-14 15:56:16 +0800
Browse Files
Merge branch 'hotfix/yohocoinuse' into beta ...
f8951f84
```
Conflicts:
	static/js/cart/cart.js
	static/js/cart/order-info.js
```
by Rock Zhang
2016-01-14 15:51:26 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into feature/web-list
0c3510a7

by yangyang
2016-01-14 15:47:14 +0800
Browse File »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
054dc3e9

by 毕凯
2016-01-14 15:47:24 +0800
Browse Files
商品详情页咨询图标
0b5a591f

by 毕凯
2016-01-14 15:47:18 +0800
Browse Files
完成sale页接口修改
52ddac06

by yangyang
2016-01-14 15:46:49 +0800
Browse Files
修复默认不使用有货币功能导致的改变地址后一些状态不能保存的bug；当退出结算页面再次从购物车进入结算页面 ...
c40ee82d
```
时清除order-info的cookie值

Code Review By Rock Zhang
```
by Rock Zhang
2016-01-14 15:44:40 +0800
Browse Files
index,js,css
41c8fa27

by whb
2016-01-14 15:37:24 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
fbb159a7

by xuqi
2016-01-14 15:23:46 +0800
Browse Files
icon bug in IE8
8a00104d

by xuqi
2016-01-14 15:18:22 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list
163d35bd

by 周少峰
2016-01-14 15:06:36 +0800
Browse File »
数据分页不一致,添加搜索提示
dab15cd9

by 周少峰
2016-01-14 15:03:09 +0800
Browse Files
解决冲突
dde131f5

by yangyang
2016-01-14 15:02:42 +0800
Browse Files
修改brands页面为并行调接口
20f75b81

by yangyang
2016-01-14 14:55:46 +0800
Browse Files
资源位web
78741420

by whb
2016-01-14 14:50:08 +0800
Browse Files
brand filter in IE.Review by:@xuqi
7a0d50d4

by xuqi
2016-01-14 14:46:49 +0800
Browse Files
修复结算页面默认选择顺丰快递然后再使用有货币时快递费计算错误的bug ...
d7d3ae19
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-01-14 14:42:16 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy.git into develop
49c5fba3

by whb
2016-01-14 14:12:18 +0800
Browse Files
filter box style
37ad3eca

by xuqi
2016-01-14 14:11:42 +0800
Browse Files
列表页面全部折扣样式
3c652178

by 毕凯
2016-01-14 14:10:11 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
a2798291

by 毕凯
2016-01-14 14:03:33 +0800
Browse Files
列表页选择条件过多时间的样式修改 code review by bikai
3c378078

by 毕凯
2016-01-14 14:03:26 +0800
Browse Files
index,css,js
933183ce

by whb
2016-01-14 13:41:34 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
663c9f81

by whb
2016-01-14 13:40:25 +0800
Browse Files