Commit Graph

877 Commits

Author SHA1 Message Date
zongzhimin ead2a9ef6f Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-07 15:23:10 +08:00
zongzhimin 5dafe2a30b YOUFANG1.0.4 2018-05-07 15:23:04 +08:00
尹吉欢 9d143205c5 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-07 15:18:41 +08:00
尹吉欢 ce7e66430d fix bug 2018-05-07 15:18:33 +08:00
xuhe@fangjia.com cf67081614 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.0.4 2018-05-07 15:17:34 +08:00
xuhe@fangjia.com 470896f3d7 用户行为日志 2018-05-07 15:17:27 +08:00
zongzhimin 930447542b Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-07 15:15:05 +08:00
zongzhimin 9e46a01361 YOUFANG1.0.4 用户工具接入 2018-05-07 15:14:59 +08:00
尹吉欢 09108f7b67 fix bug 2018-05-07 15:07:39 +08:00
尹吉欢 55414c0b94 add 2018-05-07 14:34:40 +08:00
gaojuan 54079d0e29 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-07 14:02:39 +08:00
gaojuan 75b22bfa6b 区域无价格显示 2018-05-07 14:02:22 +08:00
zongzhimin 0d701dc87a YOUFANG1.0.4 消息跳转 2018-05-07 13:46:12 +08:00
尹吉欢 b01066dc8d 主页面消息推送切换页面逻辑优化 2018-05-07 13:41:01 +08:00
raoyanhui a6a840184d Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-07 12:59:23 +08:00
raoyanhui 02727c6550 调整个人中心的删除后加载效果, 不用reload 2018-05-07 12:58:20 +08:00
raoyanhui 2eafd0be85 调整个人中心的删除后加载效果, 不用reload 2018-05-07 12:57:03 +08:00
gaojuan 285cb6fd2e Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1
Conflicts:
	fangija-zsyf/config.js
2018-05-07 12:35:30 +08:00
gaojuan e77d1d606b update 2018-05-07 12:33:23 +08:00
尹吉欢 3e0b845295 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-07 11:44:35 +08:00
尹吉欢 e8013e1e27 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-07 11:44:10 +08:00
尹吉欢 f34ed386ab 启动页负数修改 2018-05-07 11:44:03 +08:00
xuhe@fangjia.com 742d7be71e Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.0.4 2018-05-07 11:43:53 +08:00
xuhe@fangjia.com bc2d081c5d 新增用户行为 2018-05-07 11:43:21 +08:00
zongzhimin a7c56eb7d4 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-07 11:33:03 +08:00
zongzhimin ca0b17fbb3 YOUFANG1.0.4 2018-05-07 11:32:49 +08:00
尹吉欢 e7995225e6 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-07 11:30:41 +08:00
尹吉欢 fb2f28d70c 增加切换主页面方法 2018-05-07 11:30:32 +08:00
zongzhimin 29003d6472 YOUFANG1.0.4 2018-05-07 11:16:31 +08:00
zongzhimin 9fde9e24bd Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-07 11:12:42 +08:00
zongzhimin 1d05e88b1b YOUFANG1.0.4 2018-05-07 11:12:35 +08:00
bayi 61c0991c89 Merge branch 'YOUFANGAPP1.1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-07 10:49:21 +08:00
bayi b37f0b0966 调整图片样式,自适应高度,避免变形 2018-05-07 10:48:35 +08:00
gaojuan baf45f310f Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-07 10:42:45 +08:00
gaojuan 55b334eb5f log 2018-05-07 10:42:34 +08:00
gongjin 9da37782c4 update 2018-05-07 10:23:49 +08:00
gongjin f318474a64 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1
# Conflicts:
#	fangija-zsyf/config.js
2018-05-07 10:14:31 +08:00
gongjin c133ef4a32 update 个人中心tab固定 2018-05-07 10:13:04 +08:00
xuhe@fangjia.com 9c25ef0b2e Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.0.4 2018-05-07 09:39:52 +08:00
xuhe@fangjia.com d7d56c287d bug+首页用户行为记录 2018-05-07 09:39:45 +08:00
raoyanhui 1a5d2ab2e3 提交个人中心房产删除效果 2018-05-06 14:41:09 +08:00
raoyanhui d914ca9716 提交个人中心房产删除效果 2018-05-06 14:40:25 +08:00
raoyanhui 79352254fe 提交个人中心房产删除效果 2018-05-06 14:38:34 +08:00
raoyanhui 322e7fa025 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-06 14:02:06 +08:00
raoyanhui 68b586e1db 提交 main.css .starBox .star样式 2018-05-06 14:01:19 +08:00
zongzhimin 531b41184d Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-04 18:24:03 +08:00
zongzhimin 7992852ed0 YOUFANG1.0.4 消息列表 2018-05-04 18:23:53 +08:00
bayi 15195dea4a Merge branch 'YOUFANGAPP1.1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-04 17:47:27 +08:00
bayi e01a3b1604 图标统一和总楼层校验优化 2018-05-04 17:47:19 +08:00
raoyanhui 2d6e388ad5 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-04 17:43:28 +08:00