Commit Graph

278 Commits

Author SHA1 Message Date
raoyanhui 21ec4a4c8a Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-10 16:35:25 +08:00
raoyanhui 826c116d0d 提交房产管理 2018-04-10 16:34:55 +08:00
xuhe@fangjia.com 820d9c3c93 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-10 15:04:19 +08:00
xuhe@fangjia.com 472516c76b aa 2018-04-10 15:04:07 +08:00
尹吉欢 ed7357f65a Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-10 14:10:32 +08:00
尹吉欢 e6b94fe98b add 2018-04-10 14:10:23 +08:00
xuhe@fangjia.com 3d78c10ffb Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-10 13:54:51 +08:00
xuhe@fangjia.com 09feba8a75 aa 2018-04-10 13:54:38 +08:00
zongzhimin 141956e0ee YOUFANG1.1 2018-04-10 13:37:27 +08:00
zongzhimin 07758df471 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-10 13:36:28 +08:00
zongzhimin 51a6695277 YOUFANG1.1 2018-04-10 13:36:20 +08:00
raoyanhui 08b21e87fc Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-10 13:17:19 +08:00
raoyanhui 4234752e5b 提交个人中心 联调修改密码 2018-04-10 13:16:30 +08:00
raoyanhui cb5231eae1 调整我的房产管理排名部分, 暂时不显示 2018-04-10 13:11:45 +08:00
xuhe@fangjia.com 4a2668bee9 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-10 13:04:47 +08:00
xuhe@fangjia.com 1db508bc5c aa 2018-04-10 13:04:37 +08:00
xuhe@fangjia.com bb7347c289 aa 2018-04-10 13:02:28 +08:00
gaojuan 7ce01ccf22 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts:
	fangija-zsyf/yfindex.html
2018-04-10 09:38:45 +08:00
gaojuan f45baef380 update 2018-04-10 09:37:45 +08:00
xuhe@fangjia.com 1abebb5603 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1
# Conflicts:
#	fangija-zsyf/yfindex.html
2018-04-10 09:26:12 +08:00
xuhe@fangjia.com fbb27c0557 aa 2018-04-10 09:23:22 +08:00
raoyanhui d303d7cb75 Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-09 19:10:32 +08:00
raoyanhui 820b15446d 调整个人中心 登录部分 2018-04-09 19:10:20 +08:00
raoyanhui c53585bf64 新闻收藏js调整 2018-04-09 19:09:32 +08:00
raoyanhui 0d54517b21 调整我的房产js 2018-04-09 19:08:48 +08:00
raoyanhui 17488fd163 调整个人中心js 2018-04-09 19:07:58 +08:00
gaojuan 2c339824de Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-09 18:42:20 +08:00
gaojuan 5403e0ce66 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts:
	fangija-zsyf/config.js
2018-04-09 18:42:07 +08:00
xuhe@fangjia.com e7bd3a0b27 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-09 17:56:28 +08:00
xuhe@fangjia.com d98477fcdf 房产详情 2018-04-09 17:56:17 +08:00
尹吉欢 5b020dbcff 按钮加loding框 2018-04-09 13:39:07 +08:00
尹吉欢 6d6b6a2047 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-09 13:19:01 +08:00
尹吉欢 331ea61c2a 处理第三方登录昵称 2018-04-09 13:18:51 +08:00
raoyanhui 6845935b21 调整个人中心 我的收藏和我的房产加载 2018-04-09 13:03:14 +08:00
尹吉欢 d5b178d250 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-09 10:51:19 +08:00
尹吉欢 94d41743c0 login 2018-04-09 10:50:12 +08:00
zongzhimin bf3c1c258a Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-09 10:24:59 +08:00
zongzhimin db9c0d076e YOUFANG1.1.2 2018-04-09 10:24:52 +08:00
raoyanhui eb35a6e132 调整贷款额度错误 2018-04-08 20:27:44 +08:00
raoyanhui 7c50fb2525 Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-08 20:21:57 +08:00
raoyanhui 301cc55b1c 提交我的房产管理页面 2018-04-08 20:21:44 +08:00
尹吉欢 6f70e1de86 add 2018-04-08 19:25:02 +08:00
gaojuan 06a7b7f9aa add rent 2018-04-08 19:24:29 +08:00
尹吉欢 fcfb9d68b4 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-08 19:22:28 +08:00
尹吉欢 080be4273c 清空token 2018-04-08 19:21:44 +08:00
zongzhimin 39a77c5a1b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-08 18:16:31 +08:00
zongzhimin bcfe75137f YOUFANG1.1 2018-04-08 18:16:23 +08:00
xuhe@fangjia.com b28ba82411 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-08 17:43:48 +08:00
zongzhimin 6c45e16c3a YOUFANG1.1 2018-04-08 17:42:40 +08:00
xuhe@fangjia.com e5e0406b25 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1
# Conflicts:
#	fangija-zsyf/css/main.css
2018-04-08 17:42:33 +08:00