Commit Graph

552 Commits

Author SHA1 Message Date
gaojuan a681eacfd2 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 15:15:13 +08:00
gaojuan d898ac3650 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts:
	fangija-zsyf/views/component/cityIncreaseRankingComponent.js
	fangija-zsyf/views/component/cityPotentialRankingComponent.js
2018-04-16 15:15:01 +08:00
zongzhimin afa07b9a0b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 15:13:00 +08:00
zongzhimin 03cf44c9e2 YOUFANG1.0.3 2018-04-16 15:12:54 +08:00
xuhe@fangjia.com 3fcba1881b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-16 15:11:49 +08:00
xuhe@fangjia.com 0408aa84be aa 2018-04-16 15:11:07 +08:00
尹吉欢 24811d9a4b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 15:08:49 +08:00
尹吉欢 2f91452fea fix bug 4772 2018-04-16 15:08:38 +08:00
gaojuan c4e62f5e5e 添加城市过多提示 2018-04-16 14:44:41 +08:00
raoyanhui f40a3bc153 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 14:42:11 +08:00
raoyanhui c8e2e08252 添加 mui.js 控制返回直接提示 再点击一次退出问题, 在子页面不应该提示, 正确应该返回上一层页面 2018-04-16 14:41:42 +08:00
raoyanhui 750e68eef7 添加 mui.js 控制返回直接提示 再点击一次退出问题, 在子页面不应该提示, 正确应该返回上一层页面 2018-04-16 14:40:51 +08:00
raoyanhui 415bbb1733 添加 mui.js 控制返回直接提示 再点击一次退出问题, 在子页面不应该提示, 正确应该返回上一层页面 2018-04-16 14:40:14 +08:00
raoyanhui b6bd05c53c 添加 mui.js 控制返回直接提示 再点击一次退出问题, 在子页面不应该提示, 正确应该返回上一层页面 2018-04-16 14:39:52 +08:00
zongzhimin 2e41d41ded YOUFANG 1.0.3 2018-04-16 14:39:45 +08:00
raoyanhui a6c404565a 添加 mui.js 控制返回直接提示 再点击一次退出问题 2018-04-16 14:38:24 +08:00
zongzhimin 6456425e59 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
# Conflicts:
#	fangija-zsyf/views/house/houseDetail.html
2018-04-16 14:37:07 +08:00
zongzhimin 3f61328464 YOUFANG 1.0.3 2018-04-16 14:34:31 +08:00
gaojuan 7cdce5b146 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 14:24:55 +08:00
gaojuan 665a443f73 update 2018-04-16 14:24:45 +08:00
尹吉欢 bd978406f4 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 14:19:16 +08:00
尹吉欢 5da64f4330 增加城市限制提示 2018-04-16 14:19:05 +08:00
xuhe@fangjia.com f53dd4c1cd Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-16 14:05:29 +08:00
xuhe@fangjia.com 3162a5d85a aa 2018-04-16 14:05:19 +08:00
xuhe@fangjia.com 89a097a8cb aa 2018-04-16 14:04:32 +08:00
尹吉欢 32b156e454 行情网络异常vue字符串处理 2018-04-16 13:41:41 +08:00
尹吉欢 d8a093bb57 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 13:03:26 +08:00
尹吉欢 11cd4e9eef axios timeout 2018-04-16 13:03:14 +08:00
gaojuan ed8d91fb1c Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 13:00:38 +08:00
gaojuan 7d5418de95 update 2018-04-16 13:00:27 +08:00
尹吉欢 219337fb94 fix bug 2018-04-16 11:59:41 +08:00
尹吉欢 6353af5653 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 11:11:53 +08:00
尹吉欢 7b019a1b35 fix bug 4775 2018-04-16 11:11:43 +08:00
raoyanhui 04eeef6e26 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 11:01:08 +08:00
raoyanhui ffa9851e33 调整评估里面几室几厅显示成楼栋号 室号 2018-04-16 10:56:23 +08:00
zongzhimin a1f0378b7b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 10:48:07 +08:00
zongzhimin 07d560f2a0 YOUFANG1.0.3 2018-04-16 10:48:01 +08:00
gaojuan 275076efc9 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-16 10:29:51 +08:00
gaojuan 81e3ac529a 关注bug 2018-04-16 10:29:29 +08:00
zongzhimin f7399b3ba8 YOUFANG1.0.3 评估报告室号改为楼栋 2018-04-16 10:23:57 +08:00
gaojuan 6e5706b746 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 20:19:52 +08:00
gaojuan 000ff0a8b4 update 2018-04-14 20:19:40 +08:00
尹吉欢 7b1c94a9aa Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 20:00:23 +08:00
尹吉欢 decd5dfc2d add 2018-04-14 20:00:12 +08:00
raoyanhui 959387ae3a Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 19:52:09 +08:00
raoyanhui 1274c0c255 调整个人中心房产为零显示效果 2018-04-14 19:51:55 +08:00
raoyanhui 8b0fae6ce6 调整添加评估或者 添加管理后 房价为零显示问题 2018-04-14 19:50:37 +08:00
zongzhimin ed6c9b2bd8 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-14 19:03:32 +08:00
zongzhimin 4c8878197d YOUFANG1.0.3 2018-04-14 19:03:25 +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