fe / YOHO-ACTIVITY-PHP · Commits

20 Dec, 2015

5 commits

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
d6908b50

by 梁志锋
2015-12-20 14:54:23 +0800
Browse Files
购物车颜色尺码逻辑修改
ab980b0a

by 梁志锋
2015-12-20 14:54:04 +0800
Browse Files
购物车尺码颜色选择
26cb79a7

by 梁志锋
2015-12-20 14:53:27 +0800
Browse Files
code review by hf: fixes bug refs YW-1720
6fe5528b

by hf
2015-12-20 14:45:53 +0800
Browse Files
modify cart chose-panel use tpl render front to end
60f943d2

by hf
2015-12-20 14:09:35 +0800
Browse Files

18 Dec, 2015

35 commits

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
89ab8827

by hf
2015-12-18 20:06:43 +0800
Browse Files
code review by hf: fixes bug to coupon newuser second times
ac69a90d

by hf
2015-12-18 20:06:33 +0800
Browse Files
修复购物车结算页选择优惠券中优惠券是否可用的判定逻辑（通过php去过滤掉不可用的优惠券） ...
008a600e
```
但那种免邮券还是不能用

Code Review By Rock Zhang
```
by Rock Zhang
2015-12-18 19:38:31 +0800
Browse Files
code review by hf: fixes bug to coupon newuser second times
a97112aa

by hf
2015-12-18 19:10:05 +0800
Browse Files
修改订单结算页底部的价格有关信息为直接读取接口返回的数据 ...
3568bb9f
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-18 19:01:28 +0800
Browse Files
修复购物车列表页底部活动参与不显示的问题
1794aef3

by Rock Zhang
2015-12-18 18:27:33 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
7f0b2b9e

by Rock Zhang
2015-12-18 18:08:52 +0800
Browse Files
修改加价购商品详情返回的数据格式“
a951b940

by Rock Zhang
2015-12-18 18:08:46 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
58655c07

by xiaowei
2015-12-18 18:03:58 +0800
Browse Files
YW-1678 返回bug
40fb9c07

by xiaowei
2015-12-18 18:03:46 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
d60ed2d1

by 梁志锋
2015-12-18 17:48:38 +0800
Browse Files
购物车尺码颜色选择逻辑
08f569e5

by 梁志锋
2015-12-18 17:48:23 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
b7195dea

by Rock Zhang
2015-12-18 17:37:46 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
e9c438dc

by hf
2015-12-18 16:49:05 +0800
Browse Files
code review by hf: fixes bug refs YW-1669
c22c460b

by hf
2015-12-18 16:48:54 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
a5f45334

by 梁志锋
2015-12-18 16:47:17 +0800
Browse Files
购物车尺码颜色选择
dd276e9c

by 梁志锋
2015-12-18 16:47:00 +0800
Browse Files
购物车尺码颜色选择
56dbe054

by 梁志锋
2015-12-18 16:46:49 +0800
Browse Files
修复未登录添加商品只能添加一个的不过，是由于第二次添加没有绑定shopping_key ...
d21a81a9
```
等添加商品好了之后再确认
```
by Rock Zhang
2015-12-18 16:24:17 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
8ba56e9a

by uedxwg
2015-12-18 16:05:33 +0800
Browse Files
'添加活动参与'
403c94d1

by uedxwg
2015-12-18 16:05:06 +0800
Browse Files
购物车颜色尺码选择
180756d6

by 梁志锋
2015-12-18 16:02:31 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
bbce5310

by 梁志锋
2015-12-18 15:35:09 +0800
Browse Files
购物车尺码颜色选择
cbff3211

by 梁志锋
2015-12-18 15:34:53 +0800
Browse Files
购物车尺码颜色选择
fe10407b

by 梁志锋
2015-12-18 15:34:40 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4c73fb50

by xuqi
2015-12-18 15:21:37 +0800
Browse Files
cart style/logic
a167de69

by xuqi
2015-12-18 15:20:11 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
6879c3ba

by Rock Zhang
2015-12-18 14:37:02 +0800
Browse Files
修复商品总价错误的bug
9160aabb

by Rock Zhang
2015-12-18 14:33:15 +0800
Browse Files
购物车尺码颜色选择
269896b9

by 梁志锋
2015-12-18 14:31:18 +0800
Browse Files
尺码颜色选择
2c88d62d

by 梁志锋
2015-12-18 14:30:12 +0800
Browse Files
修复加价购显示的商品数目错误的bug
c20c9e57

by Rock Zhang
2015-12-18 13:13:13 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
81660dbc

by 梁志锋
2015-12-18 12:07:19 +0800
Browse Files
修改预售购物车不显示的问题
74e6399b

by 梁志锋
2015-12-18 12:07:01 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
a207ac2c

by hf
2015-12-18 12:06:18 +0800
Browse Files