wangshusheng / YOHOBUYPC · Commits

17 Nov, 2015

40 commits

修改优惠券数据处理逻辑
6eab0b60

by Rock Zhang
2015-11-17 15:57:49 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop ...
b7f47ef1
```
Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/Home.php
```
by Rock Zhang
2015-11-17 15:55:20 +0800
Browse Files
temp
bc044878

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

by hf
2015-11-17 15:48:49 +0800
Browse Files
modify to add my center api url
74f21492

by hf
2015-11-17 15:48:36 +0800
Browse Files
添加加载page js
ae56491d

by yangyang
2015-11-17 15:24:56 +0800
Browse Files
微调getorde数据格式r
5c2aa6e6

by yangyang
2015-11-17 15:13:52 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
87490eb2

by xuqi
2015-11-17 15:01:01 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
9fcd5699

by yangyang
2015-11-17 15:00:54 +0800
Browse Files
微调
d3d7ab8f

by yangyang
2015-11-17 15:00:42 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
bd623eb9

by xuqi
2015-11-17 14:51:45 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
1a3b6556

by uedxwg
2015-11-17 14:46:39 +0800
Browse Files
update
a796c7ad

by uedxwg
2015-11-17 14:45:55 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
48532400

by yangyang
2015-11-17 14:45:35 +0800
Browse Files
修复用户等级，用户个人信息接口处理的问题
cee6c827

by Rock Zhang
2015-11-17 14:39:35 +0800
Browse Files
渲染模板
06955ceb

by yangyang
2015-11-17 14:36:36 +0800
Browse Files
new template action for ajax order
b5394910

by xuqi
2015-11-17 14:31:31 +0800
Browse Files
update
839edc94

by uedxwg
2015-11-17 14:25:36 +0800
Browse Files
yoho coin
772b32c7

by xuqi
2015-11-17 14:20:11 +0800
Browse Files
更改order订单部分请求方式
8787cebd

by yangyang
2015-11-17 14:18:38 +0800
Browse Files
loading mask
b6d60448

by xuqi
2015-11-17 14:08:57 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
91a99e3a

by Rock Zhang
2015-11-17 14:06:38 +0800
Browse Files
修复保存地址接口的返回参数问题
d8715bd2

by Rock Zhang
2015-11-17 14:06:31 +0800
Browse Files
do add app embed
00f696a8

by hf
2015-11-17 13:56:18 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
a9105993

by 梁志锋
2015-11-17 13:47:13 +0800
Browse Files
update peoduct detail
27412f8d

by 梁志锋
2015-11-17 13:46:48 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
bbabd083

by xuqi
2015-11-17 13:46:46 +0800
Browse Files
no order
cb0bff1a

by xuqi
2015-11-17 13:46:38 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
3e7e2289

by Rock Zhang
2015-11-17 13:40:11 +0800
Browse Files
添加顶部tab高亮的标记
32afa072

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

by yangyang
2015-11-17 13:34:02 +0800
Browse Files
解决冲突
05239a41

by yangyang
2015-11-17 13:33:26 +0800
Browse Files
unit vip png
473e4686

by xuqi
2015-11-17 13:30:53 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
d8496d38

by uedxwg
2015-11-17 13:30:25 +0800
Browse Files
hotrank
1077ee58

by uedxwg
2015-11-17 13:29:33 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
f05ba855

by xuqi
2015-11-17 13:18:34 +0800
Browse Files
order list page
6b0240a6

by xuqi
2015-11-17 13:18:19 +0800
Browse Files
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
order list rebuild
b1faa081

by xuqi
2015-11-17 11:56:24 +0800
Browse Files