Commit Graph

800 Commits

Author SHA1 Message Date
尹吉欢 4dac2fac90 启动页优化 2018-05-02 17:30:35 +08:00
尹吉欢 c5b64e63bd Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-02 16:57:00 +08:00
尹吉欢 fa42817655 删除无效的文件,压缩app大小 2018-05-02 16:56:52 +08:00
bayi 135cddfffc Merge branch 'YOUFANGAPP1.1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-02 16:53:37 +08:00
bayi 895caa623b 小区分享相关 2018-05-02 16:53:30 +08:00
尹吉欢 5b906a93a5 增加用户客户端推送ID记录 2018-05-02 16:27:42 +08:00
尹吉欢 f8ea624e75 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-02 13:24:27 +08:00
尹吉欢 9820693b8d fix bug 4929 2018-05-02 13:23:47 +08:00
bayi 9b461ca026 Merge branch 'YOUFANGAPP1.1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-02 11:32:52 +08:00
bayi ba1380ebe9 添加本地ip用于调试 2018-05-02 11:32:33 +08:00
bayi 72b088b35d 小区添加分享 2018-05-02 11:30:43 +08:00
尹吉欢 e219e95e63 fix bug 2018-05-02 11:06:17 +08:00
尹吉欢 58e2b071ad Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-02 10:41:05 +08:00
尹吉欢 f9163a4e72 fix bug 4916 2018-05-02 10:40:57 +08:00
xuhe@fangjia.com 665dfa3591 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.0.4 2018-05-02 10:24:58 +08:00
xuhe@fangjia.com cb85fed823 aa 2018-05-02 10:24:49 +08:00
尹吉欢 56ee15be85 Merge branch 'master' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-02 10:22:45 +08:00
虞继恩 d79da211c9 Merge branch 'YOUFANGAPP1.1' into 'master'
Youfangapp1.1

See merge request !3
2018-05-02 10:21:54 +08:00
gaojuan 4e2629ba3c update 2018-04-28 19:04:11 +08:00
gaojuan 833dde55fc 找回小区详情代码 2018-04-28 19:02:25 +08:00
gaojuan f691435ef9 找回代码 2018-04-28 18:49:01 +08:00
gaojuan 9c7c9d8af4 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-28 15:45:17 +08:00
gaojuan 5690cf3951 图表修改 2018-04-28 15:45:07 +08:00
尹吉欢 cbd26d14b4 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-28 14:00:05 +08:00
尹吉欢 0aecf65306 修改网络异常页面 2018-04-28 13:59:56 +08:00
zongzhimin f9aae57cc6 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-28 13:47:59 +08:00
zongzhimin 5da7958c42 YOUFANG 1.1.1 商户工具条 2018-04-28 13:47:45 +08:00
bayi 01f97bc46c Merge branch 'YOUFANGAPP1.1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-28 13:21:02 +08:00
bayi ae8a6c4142 页面优化 2018-04-28 13:14:51 +08:00
gaojuan 215bbd4ec8 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-28 11:56:37 +08:00
gaojuan b2194dd16f 下拉刷新bug修改 2018-04-28 11:56:25 +08:00
尹吉欢 1000ca6c0e Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-28 11:52:03 +08:00
尹吉欢 0602b50e2e 启动页点击量记录 2018-04-28 11:51:53 +08:00
gaojuan adbe13e5d5 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-28 10:46:11 +08:00
gaojuan 1b36b9bb1d update 2018-04-28 10:45:57 +08:00
bayi 814fe7a26d Merge branch 'YOUFANGAPP1.1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-28 09:01:53 +08:00
bayi f0a2b84aa9 页面优化 2018-04-28 09:01:45 +08:00
gaojuan c309b26783 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1
Conflicts:
	fangija-zsyf/views/district/detail.html
2018-04-27 18:37:36 +08:00
gaojuan d9bd3dd9ec 走势 2018-04-27 18:36:37 +08:00
zongzhimin 6afaefc2ff Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-27 17:51:10 +08:00
zongzhimin 3698c0eb96 YOUFANG1.1.1 商户工具接入 2018-04-27 17:50:17 +08:00
bayi 4401d721e8 Merge branch 'YOUFANGAPP1.1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-27 17:47:00 +08:00
bayi aec1141277 意见反馈相关 2018-04-27 17:46:52 +08:00
尹吉欢 b98d4978a8 处理无引导页的情况 2018-04-27 17:46:11 +08:00
尹吉欢 c36cadb019 启动引导页 2018-04-27 17:38:57 +08:00
尹吉欢 bc4c0a4b76 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-27 17:19:12 +08:00
尹吉欢 67e2df4b8b 引导页 2018-04-27 17:19:02 +08:00
raoyanhui d00adf590c 调整冲突文件 2018-04-27 16:43:31 +08:00
zongzhimin 6db82251ca YOUFANG 1.1.1 2018-04-27 16:39:36 +08:00
raoyanhui 925091cf5e 出售分析 页面 2018-04-27 16:35:00 +08:00