wangshusheng / YOHOBUYPC · Commits

02 Feb, 2016

9 commits

Merge branch 'develop/wap' into beta/wap ...
6a17f7b4
```
Conflicts:
	static/js/me/logistic.js
```
by Rock Zhang
2016-02-02 11:45:11 +0800
Browse Files
Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into develop/wap
d6bca5af

by Rock Zhang
2016-02-02 11:40:03 +0800
Browse Files
去除我要咨询,地址编辑，添加地址，在线客服页面右上角导航 ...
81bc894b
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-02 11:39:34 +0800
Browse Files
优惠币详情页面添加优惠币为0时的提示
c08f0562

by biao
2016-02-02 11:35:32 +0800
Browse Files
排除浏览记录中下架的商品 ...
0f3946fe
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-02 11:26:50 +0800
Browse Files
使用正式环境数据
94fecd8d

by 梁志锋
2016-02-02 09:54:16 +0800
Browse Files
Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into develop/wap
26d6179d

by Rock Zhang
2016-02-02 09:53:02 +0800
Browse Files
enable gifts edit in the cart. code review by Zhang Zhen
265e04ae

by biao
2016-02-02 09:52:15 +0800
Browse Files
修复男首进入侧边导航栏，点击sale专区，没有进入全部的sale页面的bug ...
b9fb5345
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-02 09:50:15 +0800
Browse Files

01 Feb, 2016

31 commits

物流详情可能喜欢
21654fd6

by 梁志锋
2016-02-01 18:44:22 +0800
Browse Files
Merge branch 'develop/wap' of http://git.dev.yoho.cn/web/yohobuy into develop/wap
ab27f3c0

by 梁志锋
2016-02-01 18:41:30 +0800
Browse Files
物流详情页可能喜欢
82da3e32

by 梁志锋
2016-02-01 18:41:12 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
62d405c9

by Rock Zhang
2016-02-01 18:18:32 +0800
Browse Files
Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into develop/wap
7426bebf

by Rock Zhang
2016-02-01 18:16:58 +0800
Browse Files
修复收藏的品牌以及商品会1限循环的bug（接口返回数据格式变化导致） ...
eff60aa1
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-01 18:16:24 +0800
Browse Files
Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into develop/wap
6c5a720f

by 毕凯
2016-02-01 17:39:14 +0800
Browse Files
侧边栏优化
d9a18d18

by 毕凯
2016-02-01 17:39:03 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
5f3e5d8a

by Rock Zhang
2016-02-01 15:45:18 +0800
Browse Files
修复订单列表页product_name不存在时会报错的bug；修复订单详情页快递单号不存在会报错的bug ...
1b3c82ed
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-01 15:42:44 +0800
Browse Files
修复结算页使用的有货币数目没有.00后缀的bug ...
d6391a54
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-01 15:05:10 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
a5bcf146

by Rock Zhang
2016-02-01 14:55:52 +0800
Browse Files
Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into develop/wap
1a6fbeb1

by Rock Zhang
2016-02-01 14:55:27 +0800
Browse Files
如果运费大于0，订单列表页显示运费信息 ...
08e5bcb5
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-01 14:54:57 +0800
Browse Files
修改测试环境为m1
8576f44c

by 梁志锋
2016-02-01 14:27:42 +0800
Browse Files
修改环境配置
8cba5582

by 梁志锋
2016-02-01 14:18:11 +0800
Browse Files
使用有货币数目添加.00后缀 ...
a3e4be8c
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-01 14:14:21 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
85c53eb3

by Rock Zhang
2016-02-01 13:44:10 +0800
Browse Files
去除侧边栏数据中定死的逛有关数据 ...
614c690f
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-01 13:43:23 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap ...
619d3f2f
```
Conflicts:
	template/m.yohobuy.com/partials/layout/footer.phtml
```
by Rock Zhang
2016-02-01 13:36:42 +0800
Browse Files
更新静态资源版本
3abb5eea

by Rock Zhang
2016-02-01 13:35:58 +0800
Browse Files
更新到201602011331静态资源，更新到1.3.6版本
63fef7c0

by Rock Zhang
2016-02-01 13:31:34 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap ...
c02f7617
```
Conflicts:
	template/m.yohobuy.com/partials/layout/footer.phtml
```
by Rock Zhang
2016-02-01 13:31:05 +0800
Browse Files
更新静态资源版本
76ba964e

by Rock Zhang
2016-02-01 13:28:51 +0800
Browse Files
更新到201602011310静态资源
16625dbf

by Rock Zhang
2016-02-01 13:10:16 +0800
Browse Files
修改测试环境调用的静态资源地址
716b2492

by Rock Zhang
2016-02-01 13:04:08 +0800
Browse Files
更新到201602011155静态资源
82133734

by Rock Zhang
2016-02-01 11:55:21 +0800
Browse Files
修复缓存引用件 ...
588774ae
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-01 11:19:34 +0800
Browse Files
修复在线客服获取不到数据时会报错的bug ...
3fecba21
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-01 10:57:35 +0800
Browse Files
Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into develop/wap
da924005

by Rock Zhang
2016-02-01 10:18:19 +0800
Browse Files
侧边栏二级返回按钮
e077ca30

by 毕凯
2016-02-01 10:18:01 +0800
Browse Files