Commit Graph

592 Commits

Author SHA1 Message Date
尹吉欢 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
gongjin cccf9cb1e6 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 18:03:54 +08:00
gongjin 08bce137c4 update 2018-04-16 18:03:46 +08:00
尹吉欢 f7688d3b25 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 17:51:44 +08:00
尹吉欢 3d678edcf1 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 17:50:44 +08:00
gongjin 90c3f8dc22 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 17:50:41 +08:00
尹吉欢 f703393812 修改微博错误提示 2018-04-16 17:50:33 +08:00
gongjin edd881f85a update 2018-04-16 17:50:33 +08:00
gaojuan 369b83fd69 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts:
	fangija-zsyf/views/house/cityDetail.html
2018-04-16 17:48:12 +08:00
gaojuan 392f58dc34 update 2018-04-16 17:47:12 +08:00
xuhe@fangjia.com a4be886362 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-16 17:28:14 +08:00
xuhe@fangjia.com 154b9e376a aa 2018-04-16 17:28:05 +08:00
gongjin ff2d6b21a2 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 17:02:57 +08:00
gongjin 6f27bf90e3 update 2018-04-16 17:02:50 +08:00
xuhe@fangjia.com 982cceed20 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-16 16:59:20 +08:00
xuhe@fangjia.com 9db85bfca1 aa 2018-04-16 16:58:54 +08:00
gongjin 5c355e4897 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 16:38:47 +08:00
gongjin 1beeab69ec update 2018-04-16 16:38:34 +08:00
zongzhimin 31cce92206 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 16:29:34 +08:00
zongzhimin 204b15d5fc YOUFANG1.0.3 2018-04-16 16:29:27 +08:00
gaojuan bca34d1185 取消关注->取消 2018-04-16 16:18:31 +08:00
gaojuan 143b800cd3 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 15:42:48 +08:00
gaojuan d908aa50b7 暂无 2018-04-16 15:42:32 +08:00
raoyanhui 05d38356d1 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 15:36:59 +08:00
raoyanhui c616419ca4 提交 均价 和 当前城市相等 显示高零元 2018-04-16 15:36:35 +08:00
尹吉欢 7cfad02f72 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 15:35:11 +08:00
尹吉欢 3d8e7fe220 新闻评昵称显示问题修改 2018-04-16 15:35:00 +08:00
raoyanhui 2fc1970d68 调整均价显示 2018-04-16 15:24:59 +08:00
raoyanhui 897cd63f30 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 15:20:49 +08:00
raoyanhui f1abdebe90 调整 上涨概率显示 2018-04-16 15:20:37 +08:00
raoyanhui 52d5e2443a 调整 上涨概率显示 2018-04-16 15:20:14 +08:00
gaojuan a681eacfd2 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 15:15:13 +08:00
gaojuan d898ac3650 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts:
	fangija-zsyf/views/component/cityIncreaseRankingComponent.js
	fangija-zsyf/views/component/cityPotentialRankingComponent.js
2018-04-16 15:15:01 +08:00
zongzhimin afa07b9a0b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 15:13:00 +08:00
zongzhimin 03cf44c9e2 YOUFANG1.0.3 2018-04-16 15:12:54 +08:00
xuhe@fangjia.com 3fcba1881b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-16 15:11:49 +08:00
xuhe@fangjia.com 0408aa84be aa 2018-04-16 15:11:07 +08:00
尹吉欢 24811d9a4b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 15:08:49 +08:00
尹吉欢 2f91452fea fix bug 4772 2018-04-16 15:08:38 +08:00
gaojuan c4e62f5e5e 添加城市过多提示 2018-04-16 14:44:41 +08:00
raoyanhui f40a3bc153 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 14:42:11 +08:00