Commit Graph

101 Commits

Author SHA1 Message Date
尹吉欢 871c28f1bb update config 2018-03-29 09:42:37 +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
gaojuan b7cf34af9b update 2018-03-27 18:44:23 +08:00
hubingliang 636d1d7c1f 默认图片 2018-03-27 16:50:38 +08:00
hubingliang 4e3d2db3e3 转发图片 2018-03-27 16:38:34 +08:00
gaojuan 65efb9c9fe Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-27 14:57:46 +08:00
gaojuan 96b46cab92 收藏 2018-03-27 14:57:33 +08:00
尹吉欢 51dd554193 add js 2018-03-27 14:56:53 +08:00
gaojuan 4be96e6adc Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts:
	fangija-zsyf/config.js
	fangija-zsyf/manifest.json
	fangija-zsyf/views/news/newsDetail.html
2018-03-27 13:56:28 +08:00
gaojuan ff65cb0026 update 2018-03-27 13:53:09 +08:00
gaojuan 8c3c7b4db9 update 2018-03-27 13:52:36 +08:00
hubingliang c42e41c5fc 分享 2018-03-27 13:32:32 +08:00
hubingliang b1c3b1c7df 有房 2018-03-27 11:00:59 +08:00
hubingliang 27e76ebf96 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-26 14:25:56 +08:00
hubingliang b9f5c8a6ed 分享 2018-03-26 14:25:44 +08:00
尹吉欢 f6d420312a Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-26 14:09:02 +08:00
尹吉欢 7bd5bbb699 修改配置 2018-03-26 14:08:52 +08:00
xuhe@fangjia.com 16fbfcd4cc bug 2018-03-23 10:44:17 +08:00
xuhe@fangjia.com e699ead679 bug 2018-03-20 18:51:16 +08:00
xuhe@fangjia.com a8d50182c8 aa 2018-03-20 16:54:58 +08:00
xuhe@fangjia.com eff218b675 aa 2018-03-20 16:14:37 +08:00
xuhe@fangjia.com 37f3ea7aa6 bugs 2018-03-20 16:06:39 +08:00
xuhe@fangjia.com 91f685c585 搜索小区bug 2018-03-20 15:38:14 +08:00
xuhe@fangjia.com db380a6abb aa 2018-03-20 15:06:34 +08:00
xuhe@fangjia.com 45004fefcb bug 2018-03-20 14:37:10 +08:00
xuhe@fangjia.com 94642b1862 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-03-20 13:47:21 +08:00
xuhe@fangjia.com 4246382177 bug 2018-03-20 13:47:13 +08:00
尹吉欢 0d5317c0b4 增加小区详情单击事件 2018-03-20 12:04:06 +08:00
xuhe@fangjia.com bb3e0fbc39 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-03-20 11:39:11 +08:00
xuhe@fangjia.com 16658ddd16 bug 2018-03-20 11:39:02 +08:00
尹吉欢 87fcabc7ba ios兼容性跳转 2018-03-20 11:35:59 +08:00
尹吉欢 2725364af0 增加首页有房安卓退出监听 2018-03-20 10:45:56 +08:00
尹吉欢 9e9ca114cc Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-20 10:16:22 +08:00
尹吉欢 bc03d3527c update app version 2018-03-20 10:16:09 +08:00
xuhe@fangjia.com 16a528317f Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-03-20 09:36:13 +08:00
xuhe@fangjia.com c76b5e3ce8 bug 2018-03-20 09:36:04 +08:00
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