wangshusheng / YOHOBUYPC · Commits

16 Nov, 2015

40 commits

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

by 梁志锋
2015-11-16 19:13:23 +0800
Browse Files
update swipe
da0681ea

by 梁志锋
2015-11-16 19:12:50 +0800
Browse Files
order list
193b5850

by xuqi
2015-11-16 18:51:05 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
27b183c2

by yangyang
2015-11-16 18:33:05 +0800
Browse Files
合并代码
df50f73d

by yangyang
2015-11-16 18:31:05 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
036620d4
```
Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/Home.php
```
by Rock Zhang
2015-11-16 18:30:47 +0800
Browse Files
修改订单为空时，写入随便逛逛地址
da88103b

by yangyang
2015-11-16 18:29:15 +0800
Browse Files
为热销排行榜添加rank字段
3255d96b

by Rock Zhang
2015-11-16 18:26:33 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
5cb2ee5a

by uedxwg
2015-11-16 18:19:16 +0800
Browse Files
hotrand
62ab03ca

by uedxwg
2015-11-16 18:18:57 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
07d0e0b6

by ccbikai
2015-11-16 18:10:32 +0800
Browse Files
增加字体
860b807c

by ccbikai
2015-11-16 18:10:26 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
da40c60e

by yangyang
2015-11-16 17:57:21 +0800
Browse Files
解决home.php冲突,保留order控制器
895dbe1f

by yangyang
2015-11-16 17:55:15 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
ca4bedcb

by Rock Zhang
2015-11-16 17:52:57 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
48560621

by uedxwg
2015-11-16 17:49:55 +0800
Browse Files
'hotrank'
b1d10c9e

by uedxwg
2015-11-16 17:49:41 +0800
Browse Files
修改了订单控制器，完成了订单列表功能。修改页面OrderData.php；Order.php；Home.php
523a9b9a

by yangyang
2015-11-16 17:45:58 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
87c4b10d

by Rock Zhang
2015-11-16 17:25:26 +0800
Browse Files
区别一个大推荐和四个小图推荐的数据中大图是多张图与一张图
882d33e0

by Rock Zhang
2015-11-16 17:25:17 +0800
Browse Files
修复订单数据处理有关逻辑的bug
861a63b0

by Rock Zhang
2015-11-16 16:49:37 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
25a40f88

by ccbikai
2015-11-16 16:46:54 +0800
Browse Files
为您优选修改
a23f0cf5

by ccbikai
2015-11-16 16:46:48 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
66d76f1c

by Rock Zhang
2015-11-16 16:10:01 +0800
Browse Files
修改请求top100数据位异步
c1ce9adb

by Rock Zhang
2015-11-16 16:09:53 +0800
Browse Files
完善地址管理有关接口以及逻辑处理
7a7cf6ae

by Rock Zhang
2015-11-16 16:07:33 +0800
Browse Files
重构-在线客服
ea229438

by xiaowei
2015-11-16 15:31:36 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c03e17da

by xuqi
2015-11-16 15:04:48 +0800
Browse Files
order opt
1b7f2fb0

by xuqi
2015-11-16 15:04:30 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
b29318d4

by xiaowei
2015-11-16 15:03:00 +0800
Browse Files
重构-在线客服
7d66cebf

by xiaowei
2015-11-16 15:02:21 +0800
Browse Files
btn pay
19fe09e2

by xuqi
2015-11-16 14:58:09 +0800
Browse Files
合并代码
ae530e10

by ccbikai
2015-11-16 14:57:24 +0800
Browse Files
为您优选移到产品类
c0c3aaa6

by ccbikai
2015-11-16 14:55:38 +0800
Browse Files
order detail status
d9c5be93

by xuqi
2015-11-16 14:54:35 +0800
Browse Files
解决了home冲突
f406eec6

by yangyang
2015-11-16 14:46:55 +0800
Browse Files
为了更新代码而commit下
7dccfda7

by yangyang
2015-11-16 14:31:30 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
895ea3ef

by xuqi
2015-11-16 14:28:40 +0800
Browse Files
order status
622ac4c2

by xuqi
2015-11-16 14:26:54 +0800
Browse Files
在线客服样式 JS
1df8a257

by ccbikai
2015-11-16 14:25:02 +0800
Browse Files