Commit Graph

632 Commits

Author SHA1 Message Date
gaojuan 0ba9b4e8eb Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-17 17:22:20 +08:00
gaojuan f3d07ed3ea update 2018-04-17 17:22:09 +08:00
gongjin c73e23c4f6 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-17 16:50:32 +08:00
gongjin e09a30cfa2 资讯标题修改 2018-04-17 16:50:24 +08:00
xuhe@fangjia.com 25f84d4e61 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-17 16:48:35 +08:00
xuhe@fangjia.com 9a7af6bffe aa 2018-04-17 16:48:26 +08:00
尹吉欢 42ec36658e weibo share 2018-04-17 16:21:11 +08:00
尹吉欢 0c441126b8 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-17 15:00:56 +08:00
尹吉欢 4a3fe32984 请求处理 2018-04-17 15:00:21 +08:00
gongjin f566c8b041 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-17 14:55:12 +08:00
gongjin d07c77ebf9 登录页面-防止软键盘弹出所引起的定位问题 2018-04-17 14:54:59 +08:00
尹吉欢 f396c15d2c Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-17 14:28:51 +08:00
尹吉欢 a9b3401c70 房产评估重复提交问题 2018-04-17 14:28:05 +08:00
zongzhimin cc6b2d0792 YOUFANG1.0.3 2018-04-17 14:16:10 +08:00
zongzhimin 518bad9d76 YOUFANG1.0.3 js文件取本地 2018-04-17 14:09:43 +08:00
zongzhimin 66c9c59174 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-17 13:42:33 +08:00
zongzhimin 83a591e90f YOUFANG1.0.3 2018-04-17 13:42:24 +08:00
raoyanhui 119dc13488 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-17 13:12:01 +08:00
raoyanhui 87f38d0ec5 v-cloak 调整 个人中心 显示 2018-04-17 13:11:50 +08:00
raoyanhui 304b7eab33 添加v-cloak 控制vue显示效果 2018-04-17 13:09:32 +08:00
gaojuan f67f0ffcda Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-17 12:02:36 +08:00
gaojuan b3b4932181 update 2018-04-17 12:02:00 +08:00
尹吉欢 0acb074022 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-17 12:00:17 +08:00
尹吉欢 3ba569cb6b add 2018-04-17 12:00:05 +08:00
gaojuan 2a52adc4d1 关注 2018-04-17 11:48:55 +08:00
gaojuan c9b7ef2c24 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-17 11:31:10 +08:00
gongjin ead86c74c5 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-17 11:31:21 +08:00
gongjin 27852e6018 update 2018-04-17 11:31:15 +08:00
gaojuan 699b535d8c update 2018-04-17 11:30:59 +08:00
尹吉欢 8ab152cd6c Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-17 10:35:33 +08:00
尹吉欢 c1baa0153a 增加第三方分享账号 2018-04-17 10:35:23 +08:00
gongjin 0bb01e798a update 2018-04-17 10:01:12 +08:00
gongjin 9813bd721e update 2018-04-17 09:39:02 +08:00
xuhe@fangjia.com d572a56686 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-16 20:38:03 +08:00
xuhe@fangjia.com d7c22913d5 aaaa 2018-04-16 20:37:55 +08:00
gaojuan 9686ecd05b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 20:37:36 +08:00
gaojuan 43a921522d update 2018-04-16 20:37:26 +08:00
gaojuan 464dc4213e up 2018-04-16 20:33:54 +08:00
gaojuan 401a83a858 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 20:23:11 +08:00
gaojuan 826a4b0ab6 update 2018-04-16 20:23:00 +08:00
尹吉欢 131b8e36cd Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 20:19:32 +08:00
尹吉欢 cff317aaf2 修改城市选择器 2018-04-16 20:19:21 +08:00
zongzhimin 07245f4108 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 19:54:29 +08:00
zongzhimin 7d7498deaa YOUFANG1.0.3 2018-04-16 19:53:00 +08:00
xuhe@fangjia.com 4a1b5e2e5e Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-16 19:38:52 +08:00
xuhe@fangjia.com 4955663e99 aa 2018-04-16 19:38:46 +08:00
gaojuan 9a872297c1 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts:
	fangija-zsyf/views/house/cityDetail.html
	fangija-zsyf/views/house/houseDetail.html
2018-04-16 19:31:13 +08:00
gaojuan f5f4ec0487 update 2018-04-16 19:28:19 +08:00
xuhe@fangjia.com ad4f008e96 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-16 18:41:34 +08:00
xuhe@fangjia.com fdba06e5b5 aa 2018-04-16 18:41:25 +08:00