wangshusheng / YOHOBUYPC · Commits

17 Nov, 2015

40 commits

为了拉代码
17946598

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

by ccbikai
2015-11-17 16:23:50 +0800
Browse Files
添加地址
2a640b95

by ccbikai
2015-11-17 16:23:42 +0800
Browse Files
修改api，增加api2
7ceac95a

by yangyang
2015-11-17 16:22:03 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
85518ccb

by yangyang
2015-11-17 16:07:28 +0800
Browse Files
改动格式
cb3245b6

by yangyang
2015-11-17 16:07:14 +0800
Browse Files
修改新建地址接口
71ad7cce

by Rock Zhang
2015-11-17 16:02:27 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
b2fb985b

by Rock Zhang
2015-11-17 15:58:01 +0800
Browse Files
修改优惠券数据处理逻辑
6eab0b60

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

by ccbikai
2015-11-17 15:55:52 +0800
Browse Files
添加地址修改
965f6722

by ccbikai
2015-11-17 15:55:47 +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
2ca47f9c

by yangyang
2015-11-17 15:51:22 +0800
Browse Files
为了拉代码
87841988

by yangyang
2015-11-17 15:51:09 +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
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
7b27a802

by ccbikai
2015-11-17 15:44:29 +0800
Browse Files
地址管理三级菜单
2645456c

by ccbikai
2015-11-17 15:44:19 +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
修改地址 JS
e5573a58

by ccbikai
2015-11-17 14:35:07 +0800
Browse Files
地址修改 JS
55fae26e

by ccbikai
2015-11-17 14:34:04 +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