fe / YOHOBUYPC · Commits

17 Nov, 2015

14 commits

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

by uedxwg
2015-11-17 13:10:05 +0800
Browse Files
hotrank
c0d27f6c

by uedxwg
2015-11-17 13:09:25 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
01744950

by Lynnic
2015-11-17 11:02:55 +0800
Browse Files
update
7e44bee6

by Lynnic
2015-11-17 10:58:32 +0800
Browse Files
my guang data
d12d1660

by xuqi
2015-11-17 10:55:11 +0800
Browse Files
update
d2f1361c

by Lynnic
2015-11-17 10:48:29 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
99bf2ce8

by xuqi
2015-11-17 10:38:43 +0800
Browse Files
order detail action
2dabf265

by xuqi
2015-11-17 10:38:28 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
dc2bda7c

by yangyang
2015-11-17 10:26:03 +0800
Browse Files
修改订单状态错误bug
7e424cd9

by yangyang
2015-11-17 10:25:48 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
934fd990

by xuqi
2015-11-17 10:13:04 +0800
Browse Files
order load
3eba9515

by xuqi
2015-11-17 10:12:53 +0800
Browse Files
measurement method
a4437aa5

by Lynnic
2015-11-17 09:57:36 +0800
Browse Files
measurement method upadate
d6c3b835

by Lynnic
2015-11-17 09:42:48 +0800
Browse Files

16 Nov, 2015

26 commits

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

by lore-w
2015-11-16 19:16:43 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
66e2c955
```
Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/Home.php
```
by lore-w
2015-11-16 19:16:10 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
d0dc2d21

by 梁志锋
2015-11-16 19:13:23 +0800
Browse Files
我的收藏列表
829cccfe

by lore-w
2015-11-16 19:13:12 +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 Directory »
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