fe / YOHO-ACTIVITY-PHP · Commits

03 Dec, 2015

40 commits

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

by hf
2015-12-03 22:32:35 +0800
Browse Files
code review by hf: fixes bug to search list no data
975139bc

by hf
2015-12-03 22:32:09 +0800
Browse Files
Merge branch 'hotfix/apichange-bug' into develop
6e243979

by Rock Zhang
2015-12-03 22:25:45 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
d9ff2706

by Rock Zhang
2015-12-03 22:25:35 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into hotfix/apichange-bug
d746c402

by Rock Zhang
2015-12-03 22:25:05 +0800
Browse Files
修复新品到着顶部banner图的bug
58e1f35c

by Rock Zhang
2015-12-03 22:24:39 +0800
Browse Files
code review by hf: merge zhangzhen code to fixes home floor bugs
a57c9886

by hf
2015-12-03 22:20:54 +0800
Browse Files
code review by hf: merge zhangzhen code to fixes home floor bugs
17aec46a

by hf
2015-12-03 22:13:19 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
94ec3aa2

by Rock Zhang
2015-12-03 21:52:16 +0800
Browse Files
code review by hf: merge zhangzhen code to fixes home floor bugs
a019858d

by hf
2015-12-03 21:49:22 +0800
Browse Files
Merge remote-tracking branch 'origin/hotfix/apichange-bug' into develop
098424e2

by hf
2015-12-03 21:20:28 +0800
Browse Files
code review by hf: merge zhangzhen code to fixes home floor bugs
e9c64a6f

by hf
2015-12-03 21:20:20 +0800
Browse Files
Merge branch 'hotfix/apichange-bug' into develop
6669638b

by Rock Zhang
2015-12-03 21:17:05 +0800
Browse Files
修复个人中心首页报错的bug
ad978eaa

by Rock Zhang
2015-12-03 20:50:25 +0800
Browse Files
修复各频道首页报错的bug，是由楼层数据为空导致
54d7233f

by Rock Zhang
2015-12-03 20:47:21 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
028fb15f

by Rock Zhang
2015-12-03 20:45:11 +0800
Browse Files
Merge branch 'feature/fixed-bottom' into 'develop' ...
c5e5304c
```
Feature/fixed bottom

See merge request !16
```
by 梁志锋
2015-12-03 20:38:30 +0800
Browse Files
remove layer position calculation code
9d0ab03f

by biao
2015-12-03 20:34:51 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
5c76a41a

by Rock Zhang
2015-12-03 20:31:41 +0800
Browse Files
code review by hf: merge zhaobiao order logistic
3900a106

by hf
2015-12-03 20:29:41 +0800
Browse Files
code review by hf: merge zhaobiao order logistic
6e008898

by hf
2015-12-03 20:26:09 +0800
Browse Files
修复商品详情页评价中的颜色和尺码的显示方式
3e5aa6e2

by Rock Zhang
2015-12-03 20:25:49 +0800
Browse Files
code review by hf: merge zhaobiao order logistic
5b499865

by hf
2015-12-03 20:09:43 +0800
Browse Files
更换男女首底部banner所取的位置码
0cf032c2

by Rock Zhang
2015-12-03 19:24:56 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into hotfix/apichange-bug
28623c19

by Rock Zhang
2015-12-03 19:23:15 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
2a8ab0c6

by Rock Zhang
2015-12-03 19:11:25 +0800
Browse Files
更新订单，个人中心，商品详情页，购物车接口地址
8f109db5

by Rock Zhang
2015-12-03 19:11:11 +0800
Browse Files
去除标签处理逻辑，交互到java那边去处理
2cfc354c

by Rock Zhang
2015-12-03 18:45:26 +0800
Browse Files
resolve conflict for mergerequest codereview by guanning
a68bfff5

by 梁志锋
2015-12-03 18:09:30 +0800
Browse Files
resolve conflict for mergerequest codereview by guanning
288b9cfb

by 梁志锋
2015-12-03 18:08:53 +0800
Browse Files
code review by hf: merge zhaobiao order logistic
f98cb0a5

by hf
2015-12-03 17:59:07 +0800
Browse Files
do home page view my order logistic
8a191280

by hf
2015-12-03 17:56:25 +0800
Browse Files
update according to interface
e005f55f

by biao
2015-12-03 17:38:47 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
c0dfac1f

by Rock Zhang
2015-12-03 17:33:43 +0800
Browse Files
Merge branch 'hotfix/apichange-bug' into develop
47395f6b

by Rock Zhang
2015-12-03 17:33:34 +0800
Browse Files
修复浏览记录价格显示的问题
3910f616

by Rock Zhang
2015-12-03 17:30:35 +0800
Browse Files
do home page view my order logistic
9e971929

by hf
2015-12-03 17:21:48 +0800
Browse Files
修复收藏的品牌商品default_images未定义报错的bug；修复有货币调用接口错误的bug
83469011

by Rock Zhang
2015-12-03 17:16:37 +0800
Browse Files
Merge branch 'feature/address' into 'develop' ...
9a8d90f7
```
修复 地址列表选择bug

See merge request !14
```
by chenglong.wang
2015-12-03 16:12:49 +0800
Browse Files
修复浏览记录页面显示分支冲突错误信息的bug
23e4c31b

by Rock Zhang
2015-12-03 15:59:00 +0800
Browse Files