1208 Commits

Author SHA1 Message Date
gaojuan 34ccc2ef13 update 2018-03-19 18:45:07 +08:00
xuhe@fangjia.com 963b4e6e1c bug 2018-03-19 14:17:54 +08:00
xuhe@fangjia.com 6542065e84 bug 2018-03-19 13:14:45 +08:00
尹吉欢 f590bdf8f6 add js 2018-03-19 09:37:10 +08:00
xuhe@fangjia.com d0f4dff9f8 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1
# Conflicts:
#	fangija-zsyf/yfindex.html
2018-03-16 19:06:04 +08:00
xuhe@fangjia.com d74d02f527 aa 2018-03-16 19:02:08 +08:00
gaojuan 05ac1d4020 delete log 2018-03-16 18:57:06 +08:00
gaojuan 2b4680ef1d update 2018-03-16 18:53:21 +08:00
gaojuan 5253bc4c54 update 2018-03-16 18:53:07 +08:00
gaojuan 8b32d03347 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-16 18:18:40 +08:00
gaojuan 0fca4920dc update 2018-03-16 18:18:28 +08:00
zongzhimin af469ffb3d Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-16 18:06:14 +08:00
zongzhimin 8a53028f5d YOUFANG1.1 资讯详情时间展示调整 2018-03-16 18:06:06 +08:00
xuhe@fangjia.com 60ba82925c Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1
# Conflicts:
#	fangija-zsyf/css/main.css
2018-03-16 17:57:01 +08:00
xuhe@fangjia.com bc9d554dc7 aa 2018-03-16 17:56:10 +08:00
xuhe@fangjia.com a172b39711 shouye 2018-03-16 17:55:14 +08:00
尹吉欢 09bee6eaa9 新闻详情 2018-03-16 17:44:24 +08:00
gaojuan 827c9cfbe7 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts:
	fangija-zsyf/config.js
	fangija-zsyf/yfindex.html
2018-03-16 16:30:23 +08:00
gaojuan bffdb339b8 小区搜索 2018-03-16 16:28:14 +08:00
hubingliang 9faebe9283 版本更新 2018-03-16 14:55:10 +08:00
hubingliang cf43162b48 版本更新 2018-03-16 13:29:31 +08:00
hubingliang 34f4cb9dee xcx下载 2018-03-16 13:20:51 +08:00
hubingliang bc4ec7c438 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-15 18:32:41 +08:00
hubingliang fb8c92ea83 wesion update 2018-03-15 18:32:30 +08:00
xuhe@fangjia.com d5aa02127a Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-03-15 18:23:17 +08:00
xuhe@fangjia.com 9660a92c79 aa 2018-03-15 18:23:06 +08:00
尹吉欢 4285feaaf6 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-15 17:04:40 +08:00
尹吉欢 5e8e88387a 推送修改 2018-03-15 17:04:30 +08:00
zongzhimin 20d5aea8a6 有房1.1 资讯详情页面 2018-03-15 15:25:32 +08:00
xuhe@fangjia.com 44dfc14e01 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-03-15 14:51:19 +08:00
xuhe@fangjia.com 2e39c5799a aa 2018-03-15 14:49:51 +08:00
hubingliang 09d9410508 banben 2018-03-15 14:48:49 +08:00
hubingliang 6565fa9df3 版本相关 2018-03-15 14:23:54 +08:00
hubingliang f2357799ab Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts:
	fangija-zsyf/yfindex.html
2018-03-15 13:17:48 +08:00
hubingliang c99327c342 版本发布 2018-03-15 13:16:45 +08:00
尹吉欢 044b106a7e Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-15 11:58:58 +08:00
尹吉欢 1d7328d603 推送代码 2018-03-15 11:58:48 +08:00
xuhe@fangjia.com d600bff6e9 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-03-15 11:24:37 +08:00
xuhe@fangjia.com d1c3e02ba0 首页资讯 2018-03-15 11:24:29 +08:00
尹吉欢 7f97d5cb71 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-15 11:21:06 +08:00
尹吉欢 3ca4592bda 启动广告页 2018-03-15 11:20:56 +08:00
xuhe@fangjia.com 94a2df8413 app首页 2018-03-15 09:51:11 +08:00
xuhe@fangjia.com 1bb3cda7ac Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-03-14 18:15:00 +08:00
xuhe@fangjia.com b49c1ed438 首页 2018-03-14 18:14:52 +08:00
zongzhimin 32004a8668 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-14 16:13:23 +08:00
zongzhimin 9ebefada6e YOUFANG1.1 前端 2018-03-14 16:13:15 +08:00
尹吉欢 7d31aef0de 修改字体图标 2018-03-14 14:42:56 +08:00
xuhe@fangjia.com 86937635af aa 2018-03-13 17:32:08 +08:00
xuhe@fangjia.com 47c50fe5a7 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1
# Conflicts:
#	fangija-zsyf/config.js
2018-03-13 15:28:18 +08:00
xuhe@fangjia.com 4531427300 aa 2018-03-13 15:27:44 +08:00