Commit Graph

731 Commits

Author SHA1 Message Date
gaojuan f3f7cbdd5e 置换修改 2018-04-26 17:08:49 +08:00
gaojuan 05ed56d889 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-24 18:35:51 +08:00
gaojuan c6f4d541ef 置换 2018-04-24 18:35:41 +08:00
xuhe@fangjia.com c0f2f7df7f aa 2018-04-23 17:20:08 +08:00
xuhe@fangjia.com 1f7a35ac76 aa 2018-04-23 17:00:19 +08:00
虞继恩 bc270e0c05 Merge branch 'YOUFANGAPP1.1' into 'master'
Youfangapp1.1

See merge request !2
2018-04-23 10:35:36 +08:00
尹吉欢 4979cd5dd9 add 2018-04-20 22:58:53 +08:00
尹吉欢 c696ebab6a add 2018-04-20 22:47:51 +08:00
尹吉欢 4fd3ea6de2 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-20 22:22:51 +08:00
尹吉欢 7739f455e7 add 2018-04-20 22:22:42 +08:00
xuhe@fangjia.com a28a668c5b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-20 22:22:28 +08:00
xuhe@fangjia.com 95689b14f1 aa 2018-04-20 22:22:19 +08:00
gaojuan 8b34bc123e update 2018-04-20 21:27:28 +08:00
gaojuan 16490edb66 刷新 2018-04-20 20:23:03 +08:00
尹吉欢 1c948d539c Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-20 16:45:31 +08:00
尹吉欢 4839b34f98 add 2018-04-20 16:45:22 +08:00
gaojuan 63be87f7b8 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-20 16:42:34 +08:00
gaojuan c4cfb1be63 update 2018-04-20 16:42:24 +08:00
尹吉欢 8997e8c785 add img 2018-04-20 16:22:50 +08:00
尹吉欢 5df294e6e8 启动图片修改 2018-04-20 13:29:49 +08:00
尹吉欢 76efd1d2f3 修改启动图片 2018-04-20 13:13:47 +08:00
尹吉欢 41284eb2c8 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-20 13:02:44 +08:00
尹吉欢 d012d6af9c add 2018-04-20 13:02:34 +08:00
gaojuan e942f0723b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-20 12:17:46 +08:00
gaojuan 1dcd58913b 全国 2018-04-20 12:17:36 +08:00
虞继恩 27432d7018 Merge branch 'YOUFANGAPP1.1' into 'master'
Youfangapp1.1

See merge request !1
2018-04-20 09:54:55 +08:00
尹吉欢 c3d4ae26f0 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-19 21:07:23 +08:00
尹吉欢 f3b97fa93b fix bug 2018-04-19 21:07:14 +08:00
gaojuan a06dc57e58 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-19 20:52:24 +08:00
gaojuan 7ba0d7a30c update 2018-04-19 20:52:14 +08:00
尹吉欢 b407d50be2 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-19 19:56:31 +08:00
尹吉欢 a79b314567 add 2018-04-19 19:56:22 +08:00
gaojuan 29efd30e8b Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-19 19:19:18 +08:00
gaojuan 5a7a372e12 update 2018-04-19 19:19:07 +08:00
尹吉欢 f62718326d add 2018-04-19 19:06:00 +08:00
尹吉欢 94922e4cc6 启动页网络异常处理 2018-04-19 18:38:17 +08:00
gaojuan 84a2602a78 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-19 18:05:29 +08:00
gaojuan ea56641817 update 2018-04-19 18:05:17 +08:00
zongzhimin 9e0cbc91c0 YOUFANG1.0.3 app 2018-04-19 17:13:20 +08:00
zongzhimin fab73df110 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-19 16:18:20 +08:00
zongzhimin 796c30f2f8 YOUFANG1.0.3 app 2018-04-19 16:18:11 +08:00
gaojuan a0e5dc2462 add alert 2018-04-19 16:13:00 +08:00
gaojuan 6149340541 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-19 15:00:27 +08:00
gaojuan 79ea06e5c2 删除单位 2018-04-19 15:00:16 +08:00
尹吉欢 11ff44fa24 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-19 13:14:28 +08:00
尹吉欢 e9a94c1e51 add 2018-04-19 13:14:16 +08:00
gongjin 4a4c90a5cb 登录icon 2018-04-19 12:27:15 +08:00
gongjin 190fdeb28d Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-19 11:38:14 +08:00
gongjin 1ce8e325fb 行情 2018-04-19 11:38:07 +08:00
gaojuan 1c60118547 去全国测试的alert 2018-04-19 09:53:13 +08:00