Commit Graph

772 Commits

Author SHA1 Message Date
尹吉欢 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
raoyanhui 2adf99f494 调整出售分析功能 2018-04-27 16:32:38 +08:00
gaojuan 073ece57f3 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-27 13:40:38 +08:00
gaojuan 3928de11f6 update 2018-04-27 13:40:26 +08:00
raoyanhui 53a1fdeb1b Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-26 19:25:15 +08:00
raoyanhui 69530b84cf 调整updateversion js 2018-04-26 19:23:08 +08:00
尹吉欢 71fc65089d Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-26 18:07:51 +08:00
尹吉欢 50961a2fdb 启动页显示优化 2018-04-26 18:07:41 +08:00
gaojuan 58a21010b4 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-26 17:09:00 +08:00
gaojuan f3f7cbdd5e 置换修改 2018-04-26 17:08:49 +08:00
尹吉欢 5fc14c572c 合并启动入口的接口,改为一个 2018-04-25 14:32:19 +08:00
尹吉欢 a2458a4144 打开启动页 2018-04-25 14:22:42 +08:00
尹吉欢 c8fd98c89e 启动页修改 2018-04-25 13:44:26 +08:00
尹吉欢 95bff5b72e Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-04-25 10:25:12 +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
zongzhimin 22b1174826 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-23 10:44:20 +08:00
zongzhimin 7302c16ae0 youfang1.0.3 代码冲突 2018-04-23 10:43:58 +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