Commit Graph

444 Commits

Author SHA1 Message Date
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
尹吉欢 d0c72d33a1 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-13 16:58:20 +08:00
尹吉欢 2b5697bdc3 修改密码提示 2018-04-13 16:58:10 +08:00
raoyanhui 280b267377 评估列表相比均价显示错误调整 2018-04-13 16:32:08 +08:00
gaojuan 4f263c4c72 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-13 15:59:52 +08:00
gaojuan b7480a7b71 update 2018-04-13 15:59:37 +08:00
zongzhimin e20b84e4aa Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-13 15:46:40 +08:00
zongzhimin 99dae7146c YOUFANG 小区名过长、关注列表距离取消、评估报告页图片 2018-04-13 15:46:31 +08:00
xuhe@fangjia.com 5c69f7272a Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-13 15:40:14 +08:00
xuhe@fangjia.com 9eff3b8da0 aa 2018-04-13 15:40:05 +08:00
zongzhimin 73bf3968bf Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-13 14:43:46 +08:00
zongzhimin 4b3fd623c6 YOUFANG 2018-04-13 14:43:37 +08:00
gaojuan c9b2b0319b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-13 13:30:41 +08:00
gaojuan a60fcf202c 新增单独的城市 2018-04-13 13:30:31 +08:00
raoyanhui 73a55e34f3 Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-13 13:10:22 +08:00
raoyanhui e5946f5f8e 修改个人中心我的房产显示 2018-04-13 13:10:09 +08:00
raoyanhui b018e1b405 调整 详情时候 弹出信息和跳转页面同时的问题 2018-04-13 13:09:23 +08:00
xuhe@fangjia.com 2f068ef02b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-13 13:07:49 +08:00
xuhe@fangjia.com ac965b9009 aa 2018-04-13 13:07:42 +08:00
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