Commit Graph

504 Commits

Author SHA1 Message Date
raoyanhui 8b0fae6ce6 调整添加评估或者 添加管理后 房价为零显示问题 2018-04-14 19:50:37 +08:00
raoyanhui 3966cb84c7 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 18:27:22 +08:00
raoyanhui 57431d72ab 修改总价显示 2018-04-14 18:27:10 +08:00
xuhe@fangjia.com 86da2e5fac Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-14 18:24:02 +08:00
xuhe@fangjia.com 07610e3d6e zz 2018-04-14 18:23:54 +08:00
gaojuan 46990fcfb2 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 18:19:27 +08:00
gaojuan 7d0b7a6f32 update 2018-04-14 18:19:11 +08:00
xuhe@fangjia.com 406c2d35a3 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-14 17:47:06 +08:00
xuhe@fangjia.com baaa8007a4 aa 2018-04-14 17:46:25 +08:00
raoyanhui fe38c5570f Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 17:43:36 +08:00
gaojuan d31c572ccd Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 17:43:26 +08:00
gaojuan f5f5aa0e58 update 2018-04-14 17:43:14 +08:00
raoyanhui bf6c779f39 提交未登录, tab 无法切换的问题 2018-04-14 17:39:22 +08:00
尹吉欢 a3ab15a0d9 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 16:46:14 +08:00
尹吉欢 db9232c28a fix bug 4760 2018-04-14 16:46:02 +08:00
zongzhimin f936b44ad7 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 16:42:03 +08:00
zongzhimin eccdd81da4 YOUFANG app1.0.3 2018-04-14 16:41:56 +08:00
gaojuan 05db35166d Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 16:27:21 +08:00
尹吉欢 81262f56d7 登录之后刷行情 2018-04-14 16:27:18 +08:00
gaojuan 45b6474a99 地图 2018-04-14 16:27:06 +08:00
尹吉欢 17ae24c318 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 15:57:35 +08:00
尹吉欢 980fa19483 fix bug 2018-04-14 15:57:26 +08:00
zongzhimin 00fc913f8c Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 15:41:34 +08:00
zongzhimin 02ed5fad64 YOUFANG app 1.0.3 2018-04-14 15:41:26 +08:00
gaojuan 30cf61620f Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 15:33:17 +08:00
gaojuan eadd6cbf6a update 2018-04-14 15:33:01 +08:00
尹吉欢 a04b10be40 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 15:24:51 +08:00
尹吉欢 8914499116 fix bug 4748 2018-04-14 15:24:37 +08:00
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