Commit Graph

174 Commits

Author SHA1 Message Date
gaojuan 2c8b8e747d 小区详情 2018-04-03 17:39:01 +08:00
gaojuan edf397a9d1 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-02 14:18:49 +08:00
gaojuan ad9f6ec059 css 2018-04-02 14:18:35 +08:00
raoyanhui 15f5194ebb Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-02 12:49:50 +08:00
raoyanhui 8c567616e9 提交添加管理bug 2018-04-02 12:48:08 +08:00
zongzhimin 024236d719 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-02 11:20:09 +08:00
zongzhimin 9825ad189f YOUFANG 2018-04-02 11:19:48 +08:00
xuhe@fangjia.com 4f9e289833 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-02 10:43:22 +08:00
xuhe@fangjia.com 656191e6e7 css 2018-04-02 10:42:50 +08:00
zongzhimin 76026774f1 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
# Conflicts:
#	fangija-zsyf/config.js
2018-04-02 10:27:48 +08:00
zongzhimin bca41af24c YOUDANG 评估报告 2018-04-02 10:27:15 +08:00
xuhe@fangjia.com c5490d76a2 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-03-30 18:22:14 +08:00
xuhe@fangjia.com 518f2ae37e bug 2018-03-30 18:22:04 +08:00
gaojuan 637cc0b23d Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-30 16:32:31 +08:00
gaojuan 9fdc48ba56 表情提交 2018-03-30 16:32:18 +08:00
尹吉欢 617779b8e4 登录链接修改 2018-03-30 16:32:18 +08:00
尹吉欢 e27b74f83d Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-30 16:29:58 +08:00
尹吉欢 5b0e976881 commit 2018-03-30 16:29:48 +08:00
gaojuan f8142b514f 去掉测试部分 2018-03-30 16:12:56 +08:00
gaojuan 58557eb6f3 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-30 16:11:46 +08:00
gaojuan 5494a2c219 表情在文章中的显示修改 2018-03-30 16:10:49 +08:00
xuhe@fangjia.com 147dd13ad5 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-03-30 15:04:45 +08:00
xuhe@fangjia.com 36ba2e9aca bug 2018-03-30 15:04:38 +08:00
hubingliang 835c623659 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-30 14:59:57 +08:00
hubingliang 60999a8d94 3方登录 2018-03-30 14:59:33 +08:00
尹吉欢 97fef9428c update login 2018-03-30 14:58:56 +08:00
hubingliang 33a1d0f758 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-30 14:34:42 +08:00
hubingliang 34a1e76c0e 第三方登陆 2018-03-30 14:34:28 +08:00
尹吉欢 bf5ad8ee09 密码登录 2018-03-30 14:32:57 +08:00
尹吉欢 be7ca18a25 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-30 13:11:26 +08:00
尹吉欢 f06397e90c 页面回退刷新 2018-03-30 13:11:15 +08:00
hubingliang ca24f2047b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-03-30 13:08:46 +08:00
hubingliang 7e20a152ae 快捷登陆 2018-03-30 13:08:29 +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