Commit Graph

230 Commits

Author SHA1 Message Date
zongzhimin db9c0d076e YOUFANG1.1.2 2018-04-09 10:24:52 +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
xuhe@fangjia.com 5f967c59e8 新增 2018-04-08 17:41:12 +08:00
zongzhimin cf7ecad15f Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-08 17:33:38 +08:00
zongzhimin ebcf4bca2a YOUFANG1.1 2018-04-08 17:33:29 +08:00
尹吉欢 77fd5db476 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-08 16:11:26 +08:00
尹吉欢 f59f7cf214 增加模板测试用例用法 2018-04-08 16:11:16 +08:00
zongzhimin 0dd8b0dfba Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-08 15:11:47 +08:00
zongzhimin b26764013c YOUFANG1.1.2 2018-04-08 15:11:39 +08:00
尹吉欢 6e98e11d2a 设置链接跳转 2018-04-08 15:07:59 +08:00
尹吉欢 29744d9260 新闻点赞用户判断 2018-04-08 14:48:54 +08:00
尹吉欢 f61587783e 微博login 2018-04-08 14:29:04 +08:00
尹吉欢 521249607e qq login 2018-04-08 14:07:57 +08:00
尹吉欢 394eb3d845 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-08 11:29:07 +08:00
尹吉欢 7c37b035b0 新闻收藏整合登录 2018-04-08 11:28:54 +08:00
zongzhimin 8620bd8ed1 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-08 10:52:31 +08:00
zongzhimin dff3d054cb YOUFANG1.1.2 2018-04-08 10:52:23 +08:00
尹吉欢 aca59ad986 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-08 10:23:07 +08:00
尹吉欢 cc2521102a 增加菜单 2018-04-08 10:22:58 +08:00
zongzhimin cc547498ea Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-08 10:10:05 +08:00
zongzhimin a456e3ca49 YOUFANG 1.1.2 2018-04-08 10:09:56 +08:00
raoyanhui d379bde4e3 新增我的房产管理页面 2018-04-07 20:54:57 +08:00
raoyanhui e9a343d689 去掉不需要的 css文件引入 2018-04-07 20:54:24 +08:00
raoyanhui f6df2e4abb 提交个人中心图标 2018-04-04 21:27:18 +08:00
raoyanhui 9022c26a96 Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-04 19:05:48 +08:00
raoyanhui b9e9d42cea 解决分页bug , contianer 设置定位问题 2018-04-04 19:05:34 +08:00
zongzhimin 4b948c1c70 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-04 17:59:06 +08:00
zongzhimin 501b52f1b1 YOUFANG 我的关注 2018-04-04 17:58:57 +08:00
raoyanhui 1f32b445f9 调整个人中心页面 2018-04-04 17:50:22 +08:00
raoyanhui fecdd3221a 新增个人中心页面 2018-04-04 17:19:41 +08:00
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