Commit Graph

408 Commits

Author SHA1 Message Date
zongzhimin a033f1fcde Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-13 12:02:12 +08:00
zongzhimin d34ef2f1a9 YOUFANG app 2018-04-13 12:02:05 +08:00
xuhe@fangjia.com fefc792038 aa 2018-04-13 11:26:44 +08:00
xuhe@fangjia.com a7188d285c Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-13 11:17:08 +08:00
xuhe@fangjia.com 70e94b92a4 aa 2018-04-13 11:17:00 +08:00
尹吉欢 94328b2802 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-13 10:26:55 +08:00
尹吉欢 37deba64e8 fix login bug 2018-04-13 10:26:44 +08:00
xuhe@fangjia.com e82b472c3e Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-13 10:26:08 +08:00
xuhe@fangjia.com 52eff2c755 aa 2018-04-13 10:26:00 +08:00
gaojuan 21aed7b09f update 2018-04-13 10:05:44 +08:00
gaojuan 108d175352 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 21:06:19 +08:00
gaojuan 4d2c244a41 update 2018-04-12 21:06:09 +08:00
尹吉欢 54f54a15ef Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 21:04:51 +08:00
尹吉欢 80a0022039 城市选择修改,会卡死启动页 2018-04-12 21:04:41 +08:00
raoyanhui 395e751cdf Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 20:43:14 +08:00
raoyanhui b92e98ef1b 调整个人中心隐藏功能 2018-04-12 20:38:12 +08:00
raoyanhui 94dbbd247c 调整seeting 用户退出 加载 userinfo 2018-04-12 20:37:21 +08:00
raoyanhui 4a4e38a396 添加城市搜索功能 2018-04-12 20:36:26 +08:00
尹吉欢 bd3cabf9f7 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 20:35:22 +08:00
尹吉欢 c0b6518e2d 分享用缩略图 2018-04-12 20:34:41 +08:00
xuhe@fangjia.com 3e95ff6315 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-12 20:17:23 +08:00
xuhe@fangjia.com bb2d954d57 aa 2018-04-12 20:16:47 +08:00
zongzhimin 4c7a20f998 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 20:13:01 +08:00
zongzhimin f03d5d98d9 YOUFANG 2018-04-12 20:12:53 +08:00
zongzhimin faf273c9e2 YOUFANG 2018-04-12 20:11:57 +08:00
gaojuan 6f85e52776 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 19:56:56 +08:00
gaojuan f2b2a69bfa update 2018-04-12 19:56:13 +08:00
xuhe@fangjia.com 75fec8b1d3 aa 2018-04-12 19:53:18 +08:00
xuhe@fangjia.com 6ed1fa8fe7 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-12 19:42:44 +08:00
xuhe@fangjia.com 647c0a6453 aa 2018-04-12 19:42:34 +08:00
zongzhimin 11bbdd7bd2 YOUFANG1.1 2018-04-12 18:34:17 +08:00
zongzhimin 8bd9c1e9ff Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-12 17:46:53 +08:00
zongzhimin 97083618b5 YOUFANG 2018-04-12 17:46:46 +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