Commit Graph

476 Commits

Author SHA1 Message Date
gaojuan e2336cbaa9 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 15:17:59 +08:00
gaojuan 0059f755a1 走势开始时间修改 2018-04-14 15:17:42 +08:00
尹吉欢 06486155e3 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 15:14:46 +08:00
尹吉欢 61e608d687 fix bug 4747 2018-04-14 15:14:35 +08:00
gaojuan 9b835f06ca Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 15:05:53 +08:00
gaojuan d3d80496a3 房产管理走势点击 2018-04-14 15:05:42 +08:00
尹吉欢 9e9995cacf Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 15:00:31 +08:00
尹吉欢 e5a6938ba7 fix bug 4746 2018-04-14 15:00:20 +08:00
gaojuan efc0f8ae42 splice bug 2018-04-14 14:54:53 +08:00
zongzhimin dd07caa411 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 14:42:02 +08:00
zongzhimin 7e7490b864 YOUFANG app 1.0.3 2018-04-14 14:41:54 +08:00
gaojuan 5f995c5447 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 14:37:41 +08:00
gaojuan 5553ed6c3d update 2018-04-14 14:37:31 +08:00
尹吉欢 db126d379b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 14:37:03 +08:00
尹吉欢 defae94310 pass reg add 2018-04-14 14:36:52 +08:00
gaojuan 3d9e562eaf Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts:
	fangija-zsyf/js/district/districtDetail.js
	fangija-zsyf/views/house/houseDetail.html
2018-04-14 14:31:01 +08:00
gaojuan 3607037970 update 2018-04-14 14:26:24 +08:00
xuhe@fangjia.com a5476f8e7b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-14 14:21:30 +08:00
xuhe@fangjia.com 418f4c2aef aa 2018-04-14 14:21:22 +08:00
zongzhimin b95ac2394a Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 11:43:17 +08:00
zongzhimin 3eda178c36 YOUFANG 2018-04-14 11:43:10 +08:00
尹吉欢 6712eda00a Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 10:47:01 +08:00
尹吉欢 ea7d2d3dee 租金走势增加默认参数 2018-04-14 10:46:48 +08:00
zongzhimin 37367c7785 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 10:41:33 +08:00
zongzhimin 57572a97a4 YOUFANG app 1.0.3 2018-04-14 10:41:25 +08:00
尹吉欢 4857d6a933 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 10:21:31 +08:00
尹吉欢 ea6ea1740b 小区详情修改 2018-04-14 10:21:20 +08:00
zongzhimin 8582a26460 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 10:13:28 +08:00
zongzhimin e1fe37bc92 YOUFANG app 2018-04-14 10:13:21 +08:00
xuhe@fangjia.com 025d5eb6bc aa 2018-04-14 10:11:36 +08:00
raoyanhui 8ba7c193e7 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-13 20:17:51 +08:00
raoyanhui 40aca59222 调整各区县无数据显示效果 2018-04-13 20:17:40 +08:00
zongzhimin ed302fb59f YOUFANG app 1.0.3 2018-04-13 19:43:43 +08:00
zongzhimin 505156094f Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-13 19:38:19 +08:00
zongzhimin 9d66615c93 YOUFANG app 2018-04-13 19:38:12 +08:00
xuhe@fangjia.com bbf2855979 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-13 19:34:55 +08:00
xuhe@fangjia.com 3dd8a3c3a8 aa 2018-04-13 19:34:49 +08:00
zongzhimin 848292dd6a Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-13 19:26:56 +08:00
zongzhimin 6704ec980d YOUFANG app 2018-04-13 19:26:51 +08:00
xuhe@fangjia.com c8322262f3 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-13 19:02:59 +08:00
xuhe@fangjia.com d1a8eea4db aa 2018-04-13 19:02:52 +08:00
raoyanhui ebbd068b86 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-13 18:29:54 +08:00
raoyanhui 2b8e8f5579 解决个人中心收藏显示有空格 2018-04-13 18:29:37 +08:00
gaojuan a15bd605d2 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts:
	fangija-zsyf/views/setting/setting.html
2018-04-13 18:27:16 +08:00
gaojuan e26aa7ac7f update 2018-04-13 18:26:36 +08:00
zongzhimin 9ea8d46c92 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-13 18:24:36 +08:00
zongzhimin 7208804c02 YOUFANG 2018-04-13 18:24:30 +08:00
raoyanhui a4c3361ba5 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-13 17:39:19 +08:00
raoyanhui ff1788a34a 提交个人信息登录 刷新 评估 首页 2018-04-13 17:36:25 +08:00
raoyanhui cf8a8dc610 提交退出登录刷新首页 2018-04-13 17:35:37 +08:00