wangshusheng / YOHOBUYPC · Commits

15 Apr, 2016

22 commits

修复测试环境登陆不上的问题
5f18cafd

by Rock Zhang
2016-04-15 17:31:57 +0800
Browse Files
更新到201604151729静态资源
ca33a71a

by Rock Zhang
2016-04-15 17:29:28 +0800
Browse Files
Merge remote-tracking branch 'origin/feature/order' into feature/order
84daa32c

by 梁志锋
2016-04-15 17:26:06 +0800
Browse Files
merge master
a7810afe

by 梁志锋
2016-04-15 17:24:47 +0800
Browse Files
Merge branch 'feature/order' of http://git.dev.yoho.cn/web/yohobuy into feature/order
67189ad9

by uedxwg
2016-04-15 17:20:37 +0800
Browse Files
merge 图标分支
a61769e1

by 梁志锋
2016-04-15 17:20:10 +0800
Browse Files
代码合并
6fc0b627

by uedxwg
2016-04-15 17:19:29 +0800
Browse Files
Merge branch 'feature/order' of http://git.dev.yoho.cn/web/yohobuy into feature/order
b383bd2f

by uedxwg
2016-04-15 17:16:03 +0800
Browse Files
冲突修改
6bcc053f

by uedxwg
2016-04-15 17:11:59 +0800
Browse Files
底部用户替换
82f3104a

by uedxwg
2016-04-15 17:08:19 +0800
Browse Files
PC测试腾讯云灰度
13e3a7b3

by whb
2016-04-15 17:07:06 +0800
Browse Files
Merge remote-tracking branch 'origin/feature/order' into feature/order
ec1c95b2

by 梁志锋
2016-04-15 17:03:39 +0800
Browse Files
update assets
a8444abf

by 梁志锋
2016-04-15 16:56:59 +0800
Browse Files
更新到201604151654静态资源
a38b9b92

by Rock Zhang
2016-04-15 16:55:01 +0800
Browse Files
Merge branch 'feature/order' of git.dev.yoho.cn:web/yohobuy into feature/order
2511b107

by Rock Zhang
2016-04-15 16:54:12 +0800
Browse Files
修复购物车中选择赠品或者加价购商品，结算页计算商品总价报错的bug（不应该通过subtotal计算） ...
5199a17b
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-04-15 16:53:07 +0800
Browse Files
Merge branch 'feature/order' of git.dev.yoho.cn:web/yohobuy into feature/order
07b4e5d8

by 毕凯
2016-04-15 16:35:09 +0800
Browse Files
购物车选择框加载优化
51d55e01

by 毕凯
2016-04-15 16:34:46 +0800
Browse Files
赠品加价购取消修改按钮
17d4bbbb

by uedxwg
2016-04-15 16:27:18 +0800
Browse Files
测试提交
7e9083fe

by uedxwg
2016-04-15 15:32:54 +0800
Browse Files
清楚log打印
e0aa5f6e

by uedxwg
2016-04-15 15:26:37 +0800
Browse Files
送货时间修改
83b8416b

by uedxwg
2016-04-15 15:08:46 +0800
Browse Files

14 Apr, 2016

18 commits

merge https 分支
9e047f88

by 梁志锋
2016-04-14 22:25:22 +0800
Browse Files
merge https 分支
5ec94a36

by 梁志锋
2016-04-14 22:24:02 +0800
Browse Files
修复逛品牌列表页收藏错误的bug ...
8e22d5f4
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-04-14 21:27:45 +0800
Browse Files
更新到阿里云的memcache配置
96ee5760

by Rock Zhang
2016-04-14 21:24:21 +0800
Browse Files
Merge branch 'hotfix/unionTrans'
1f6e14c5

by Rock Zhang
2016-04-14 20:25:12 +0800
Browse Files
PC的个人中心和购物车相关bug
f0c09ec1

by whb
2016-04-14 18:57:15 +0800
Browse Files
修复品牌列表页收藏状态错误的bug（uid为空时也传递到接口导致，改为不传uid参数） ...
46a6100e
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-04-14 17:33:53 +0800
Browse Files
update for the yoholog
b7068984

by biao
2016-04-14 17:22:32 +0800
Browse Files
Merge branch 'master' of http://git.dev.yoho.cn/web/yohobuy.git
60469c3f

by whb
2016-04-14 17:05:25 +0800
Browse Files
footer配置
d17297c0

by whb
2016-04-14 17:05:19 +0800
Browse Files
先上亚马逊
1d8fef91

by 梁志锋
2016-04-14 17:03:56 +0800
Browse Files
PC的购物车优惠券不能使用
d2ae5bf8

by whb
2016-04-14 16:58:25 +0800
Browse Files
修复结算页中价格为0时不显示为0.00的bug ...
567d5a0a
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-04-14 16:29:38 +0800
Browse Files
样式修改
16b31e02

by uedxwg
2016-04-14 15:50:42 +0800
Browse Files
升版本
4fcd7c20

by 梁志锋
2016-04-14 15:31:51 +0800
Browse Files
升版本
67ed9c21

by 梁志锋
2016-04-14 15:31:39 +0800
Browse Files
Merge remote-tracking branch 'remotes/origin/hotfix/login'
8cc57470

by 梁志锋
2016-04-14 15:26:03 +0800
Browse Files
PC搜索切换成aws
08139782

by whb
2016-04-14 13:08:21 +0800
Browse Files