Commit Graph

377 Commits

Author SHA1 Message Date
raoyanhui 94dbbd247c 调整seeting 用户退出 加载 userinfo 2018-04-12 20:37:21 +08:00
raoyanhui 4a4e38a396 添加城市搜索功能 2018-04-12 20:36:26 +08:00
raoyanhui 81b1377d25 Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 17:35:55 +08:00
raoyanhui 0dfecd473a 提交房产列表回调, 分页数据错乱问题 2018-04-12 17:35:42 +08:00
xuhe@fangjia.com 9faa89226e Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-12 17:15:32 +08:00
xuhe@fangjia.com d2c7c74962 aa 2018-04-12 17:15:15 +08:00
gaojuan afbb51372e Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts:
	fangija-zsyf/views/house/houseDetail.html
2018-04-12 17:08:04 +08:00
gaojuan 255712ecb7 add region 2018-04-12 17:06:49 +08:00
gaojuan 0b083cec60 update 2018-04-12 17:06:36 +08:00
xuhe@fangjia.com 66dfe8c9e4 aa 2018-04-12 16:32:12 +08:00
zongzhimin f7f70e8cd5 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 15:19:58 +08:00
zongzhimin b64367aff7 YOUFANG 2018-04-12 15:19:52 +08:00
尹吉欢 a13f95c42b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 15:16:53 +08:00
尹吉欢 18363776dc 设置中增加修改密码入口 2018-04-12 15:16:41 +08:00
xuhe@fangjia.com 61915b1fec Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-12 15:01:42 +08:00
xuhe@fangjia.com 38c8b2ce75 aa 2018-04-12 15:01:32 +08:00
xuhe@fangjia.com 3cbfd87acd aa 2018-04-12 15:00:25 +08:00
zongzhimin 719c9653ec YOUFANG 2018-04-12 14:03:37 +08:00
zongzhimin 87174fbf44 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
# Conflicts:
#	fangija-zsyf/views/user/userInfo.html
2018-04-12 13:53:56 +08:00
zongzhimin cdb2ad5faa YOUFANG 2018-04-12 13:52:29 +08:00
尹吉欢 d39ab229c1 修改页面标题 2018-04-12 13:46:13 +08:00
xuhe@fangjia.com 7cdb392109 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-12 13:17:58 +08:00
xuhe@fangjia.com ca1565f161 aa 2018-04-12 13:17:49 +08:00
raoyanhui 52ac66d3a3 Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 12:46:01 +08:00
raoyanhui 8548dd7f74 提交 2018-04-12 12:45:48 +08:00
raoyanhui e9f889d3aa 提交个人中心 2018-04-12 12:45:31 +08:00
raoyanhui 41a8bcc2a9 联调用户中心页面 2018-04-12 12:44:24 +08:00
尹吉欢 7c2dcfb512 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 12:00:55 +08:00
尹吉欢 bc4cac1a7f 接入设置功能 2018-04-12 12:00:43 +08:00
zongzhimin 389adef9a6 YOUFANG 2018-04-12 11:54:39 +08:00
zongzhimin 4df958148e Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 11:53:05 +08:00
zongzhimin e4ad72dbba YOUFANG1.1 2018-04-12 11:52:58 +08:00
zongzhimin 9f316bca49 YOUFANG 房产详情 2018-04-12 11:52:17 +08:00
xuhe@fangjia.com 1a72410c29 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-12 11:39:34 +08:00
xuhe@fangjia.com 130a45f501 aa 2018-04-12 11:38:28 +08:00
gaojuan f599212ce2 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 11:35:23 +08:00
gaojuan 594b356a08 update 2018-04-12 11:35:13 +08:00
尹吉欢 d2df494876 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 11:23:47 +08:00
尹吉欢 4f590cc834 协议 2018-04-12 11:23:35 +08:00
zongzhimin 5323f54d2e Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 11:17:32 +08:00
zongzhimin 26b3ba1525 YOUFANG 房产行情+评估报告 2018-04-12 11:17:25 +08:00
gaojuan 87806ab6f0 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 11:07:48 +08:00
gaojuan 2a836d5e7e add 2018-04-12 11:07:36 +08:00
raoyanhui 81bcb96b65 Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 11:07:26 +08:00
raoyanhui 9d9d6ca853 调整贷款 2018-04-12 11:07:10 +08:00
xuhe@fangjia.com 15ee265013 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-12 10:53:29 +08:00
xuhe@fangjia.com 6595ce0055 aa 2018-04-12 10:53:15 +08:00
尹吉欢 d06b60bdc0 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 10:52:55 +08:00
尹吉欢 149b223ea3 add 2018-04-12 10:52:44 +08:00
zongzhimin 4ae3da435a Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 10:51:10 +08:00