Commit Graph

142 Commits

Author SHA1 Message Date
zongzhimin bca41af24c YOUDANG 评估报告 2018-04-02 10:27:15 +08:00
zongzhimin 5cd2a9b7fd Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-30 10:34:17 +08:00
zongzhimin deb1d158b1 YOUFANG1.1 评估报告 2018-03-30 10:34:10 +08:00
xuhe@fangjia.com 42a97a8852 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-03-30 10:18:30 +08:00
xuhe@fangjia.com 5fab6ca812 返回刷新 2018-03-30 10:08:55 +08:00
尹吉欢 23347d4dd2 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-30 09:52:29 +08:00
尹吉欢 4731927d59 update main 2018-03-30 09:52:19 +08:00
xuhe@fangjia.com 8afcd98c5b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-03-30 09:50:20 +08:00
xuhe@fangjia.com a4be112e1a aa 2018-03-30 09:50:10 +08:00
尹吉欢 4d6018d8ca Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-30 09:42:25 +08:00
尹吉欢 6d681f8488 绑定手机页面提交 2018-03-30 09:42:14 +08:00
raoyanhui 99a123cfbc Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-03-30 09:39:21 +08:00
raoyanhui e01253754c 调整js 部分封装 2018-03-30 09:39:09 +08:00
xuhe@fangjia.com ac2d0ec58d Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-03-29 18:23:47 +08:00
xuhe@fangjia.com 0fd0046bcb Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1
# Conflicts:
#	fangija-zsyf/views/news/newsDetail.html
2018-03-29 18:23:39 +08:00
zongzhimin 37c1a8ee32 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
# Conflicts:
#	fangija-zsyf/config.js
2018-03-29 18:23:16 +08:00
xuhe@fangjia.com 05698f8053 bug 2018-03-29 18:22:43 +08:00
zongzhimin 07724860b8 评估报告页 2018-03-29 18:22:03 +08:00
gaojuan bbc0103b62 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts:
	fangija-zsyf/config.js
2018-03-29 18:14:58 +08:00
gaojuan e8fd2fb456 update 2018-03-29 18:14:06 +08:00
raoyanhui b58cc2781a 调整 loading 效果, 调整 js 先em css效果 2018-03-29 17:44:04 +08:00
raoyanhui 58f361aae2 Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-03-29 17:34:18 +08:00
raoyanhui ba58347b99 添加 评估列表加载loading 效果 2018-03-29 17:32:11 +08:00
hubingliang 776bb90d3d Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-29 17:27:34 +08:00
hubingliang a07876257f 登陆 2018-03-29 17:27:19 +08:00
raoyanhui 0b4fec4ff5 Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-03-29 16:52:32 +08:00
raoyanhui a597056747 提交评估列表 2018-03-29 16:50:39 +08:00
尹吉欢 5c08398da0 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-29 16:46:23 +08:00
尹吉欢 9071ecdf43 修改密码 2018-03-29 16:46:12 +08:00
zongzhimin b04e93b60d Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-29 16:13:03 +08:00
zongzhimin c520b8c16e 有房App 评估结果 2018-03-29 16:12:56 +08:00
尹吉欢 5696a1b9b8 提交修改密码页面 2018-03-29 15:43:23 +08:00
raoyanhui 71c14988ce Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-03-29 13:38:45 +08:00
raoyanhui fbdbe0112e 提交评估列表 2018-03-29 13:29:59 +08:00
xuhe@fangjia.com 3df13f45ba 首页加载修改 2018-03-29 13:11:34 +08:00
hubingliang f4717f7960 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts:
	fangija-zsyf/manifest.json
2018-03-29 10:47:22 +08:00
hubingliang 54564fbb26 有房 2018-03-29 10:46:03 +08:00
尹吉欢 55017cb509 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-29 09:42:46 +08:00
尹吉欢 871c28f1bb update config 2018-03-29 09:42:37 +08:00
gaojuan 45df69ba57 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-29 09:36:29 +08:00
gaojuan d4fa4098fe delete 2018-03-29 09:36:13 +08:00
raoyanhui 63264cbf43 tijiao 2018-03-28 19:32:15 +08:00
xuhe@fangjia.com 7dc08e9e0f 新增历史推荐小区 2018-03-28 18:04:25 +08:00
xuhe@fangjia.com 268730476e bug 2018-03-28 16:47:35 +08:00
xuhe@fangjia.com 54ed217409 css 2018-03-28 15:30:59 +08:00
xuhe@fangjia.com 392c74150f css 2018-03-28 15:06:29 +08:00
xuhe@fangjia.com 6de4bbad79 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1
# Conflicts:
#	fangija-zsyf/css/main.css
2018-03-28 15:05:30 +08:00
xuhe@fangjia.com 13358aad16 有房首页修改 2018-03-28 14:53:52 +08:00
gaojuan 548805f1c0 bug update 2018-03-28 13:42:38 +08:00
gaojuan 4357760a09 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts:
	fangija-zsyf/views/news/newsDetail.html
2018-03-27 18:45:26 +08:00