Commit Graph

196 Commits

Author SHA1 Message Date
raoyanhui c04f49c8da Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-04 17:17:40 +08:00
raoyanhui ecfdf49ee6 调整个人中心部分 2018-04-04 17:17:24 +08:00
zongzhimin 885fb64bbf Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-04 15:57:00 +08:00
zongzhimin 29c0773099 YOUFANG1.1.3 2018-04-04 15:56:51 +08:00
raoyanhui 304d2d7f48 Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-04 15:34:59 +08:00
raoyanhui f8efd391e9 提交素材 2018-04-04 15:34:48 +08:00
raoyanhui 2d9684bc28 提交最新素材 图片部分 2018-04-04 13:41:06 +08:00
xuhe@fangjia.com 980622e9c3 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-03 16:05:10 +08:00
xuhe@fangjia.com 6f56c95384 aa 2018-04-03 16:05:00 +08:00
xuhe@fangjia.com 2c52b26a08 shouye 2018-04-03 16:04:16 +08:00
raoyanhui f14da29ad8 Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-03 15:58:57 +08:00
raoyanhui b6aff60ed1 添加 我的收藏 2018-04-03 15:58:28 +08:00
hubingliang 6328841de0 disanfang 2018-04-03 14:29:33 +08:00
hubingliang 206aa69dd2 第三方登陆 2018-04-03 13:48:09 +08:00
raoyanhui 79b14080f3 调整 房产评估细节 2018-04-03 11:21:33 +08:00
hubingliang 1054e3daa6 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-03 09:45:47 +08:00
hubingliang 49a281e51d 第三方登录 2018-04-03 09:45:10 +08:00
xuhe@fangjia.com 19db7a3941 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-02 18:57:56 +08:00
xuhe@fangjia.com ae7db80789 bug 2018-04-02 18:57:48 +08:00
zongzhimin 02d7a46a2d Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-02 16:30:05 +08:00
zongzhimin 995866d19e YOUFANG 评估结果+我的关注 2018-04-02 16:29:56 +08:00
xuhe@fangjia.com 8386a8f72b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-02 14:27:34 +08:00
xuhe@fangjia.com 4c89b814a3 aa 2018-04-02 14:27:24 +08:00
gaojuan edf397a9d1 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-02 14:18:49 +08:00
gaojuan ad9f6ec059 css 2018-04-02 14:18:35 +08:00
raoyanhui 15f5194ebb Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-02 12:49:50 +08:00
raoyanhui 8c567616e9 提交添加管理bug 2018-04-02 12:48:08 +08:00
zongzhimin 024236d719 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-02 11:20:09 +08:00
zongzhimin 9825ad189f YOUFANG 2018-04-02 11:19:48 +08:00
xuhe@fangjia.com 4f9e289833 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-02 10:43:22 +08:00
xuhe@fangjia.com 656191e6e7 css 2018-04-02 10:42:50 +08:00
zongzhimin 76026774f1 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
# Conflicts:
#	fangija-zsyf/config.js
2018-04-02 10:27:48 +08:00
zongzhimin bca41af24c YOUDANG 评估报告 2018-04-02 10:27:15 +08:00
xuhe@fangjia.com c5490d76a2 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-03-30 18:22:14 +08:00
xuhe@fangjia.com 518f2ae37e bug 2018-03-30 18:22:04 +08:00
gaojuan 637cc0b23d Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-30 16:32:31 +08:00
gaojuan 9fdc48ba56 表情提交 2018-03-30 16:32:18 +08:00
尹吉欢 617779b8e4 登录链接修改 2018-03-30 16:32:18 +08:00
尹吉欢 e27b74f83d Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-30 16:29:58 +08:00
尹吉欢 5b0e976881 commit 2018-03-30 16:29:48 +08:00
gaojuan f8142b514f 去掉测试部分 2018-03-30 16:12:56 +08:00
gaojuan 58557eb6f3 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-30 16:11:46 +08:00
gaojuan 5494a2c219 表情在文章中的显示修改 2018-03-30 16:10:49 +08:00
xuhe@fangjia.com 147dd13ad5 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-03-30 15:04:45 +08:00
xuhe@fangjia.com 36ba2e9aca bug 2018-03-30 15:04:38 +08:00
hubingliang 835c623659 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-30 14:59:57 +08:00
hubingliang 60999a8d94 3方登录 2018-03-30 14:59:33 +08:00
尹吉欢 97fef9428c update login 2018-03-30 14:58:56 +08:00
hubingliang 33a1d0f758 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-30 14:34:42 +08:00
hubingliang 34a1e76c0e 第三方登陆 2018-03-30 14:34:28 +08:00