Commit Graph

1077 Commits

Author SHA1 Message Date
gaojuan 30d53b1f3f 图表图片 2018-05-18 18:06:14 +08:00
gaojuan a0a64f9af6 Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-18 17:07:01 +08:00
gaojuan 3d59a57d2c 图表 2018-05-18 17:06:32 +08:00
xuhe@fangjia.com 3f0a0013f0 Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into xh-YOUFANGAPP1.1.2
# Conflicts:
#	fangija-zsyf/yfindex.html
2018-05-18 16:45:59 +08:00
xuhe@fangjia.com d14079c880 fix bug 2018-05-18 16:45:10 +08:00
bayi f3d9ef19e0 Merge branch 'YOUFANGAPP1.1.2' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-18 16:08:54 +08:00
bayi 7351b4695a 页面优化 2018-05-18 16:08:16 +08:00
gaojuan b2b4fd2825 Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-18 14:54:55 +08:00
gaojuan 8b4e517fca 非改 2018-05-18 14:53:39 +08:00
gaojuan a8693975ea ios css update 2018-05-18 14:49:45 +08:00
尹吉欢 854b11ed43 Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-18 14:10:55 +08:00
尹吉欢 fd9843b914 修改版本号为下个版本的 2018-05-18 14:10:40 +08:00
尹吉欢 c901a0a25e Merge branch 'master' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-18 14:08:46 +08:00
虞继恩 2ebc5162f5 Merge branch 'YOUFANGAPP1.1.1' into 'master'
Youfangapp1.1.1

See merge request !5
2018-05-18 11:30:28 +08:00
尹吉欢 3ee62b5912 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-18 11:29:53 +08:00
尹吉欢 72e5d4da7e 去掉贷款额度文字 2018-05-18 11:29:39 +08:00
gaojuan ac54918c75 fix bug 2018-05-18 11:04:52 +08:00
gaojuan 4fd63752e3 资讯加载 2018-05-18 10:38:09 +08:00
gaojuan 13aaa16f15 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-17 15:26:12 +08:00
gaojuan d7119d0582 Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.2
Conflicts:
	fangija-zsyf/manifest.json
2018-05-17 15:24:49 +08:00
gaojuan 0caef39c53 up 2018-05-17 15:23:14 +08:00
gaojuan 1c137a2c21 Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.1 2018-05-17 15:20:12 +08:00
gaojuan c9db36afa4 css fix bug 2018-05-17 15:19:45 +08:00
xuhe@fangjia.com cd3a815a33 Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into xh-YOUFANGAPP1.1.2 2018-05-17 15:09:24 +08:00
xuhe@fangjia.com 1e682025c9 css 2018-05-17 15:09:16 +08:00
尹吉欢 7986867def 修改版本 2018-05-17 09:18:58 +08:00
bayi 436a477b88 排序规则调整 2018-05-16 14:49:27 +08:00
bayi ce346f710c 页面优化 2018-05-16 14:27:39 +08:00
bayi f033ba52e9 页面优化 2018-05-16 13:30:49 +08:00
bayi eeddd19c10 添加城市均价排行 2018-05-16 11:39:08 +08:00
bayi 9b59d99c7e 页面样式优化 2018-05-15 17:34:05 +08:00
bayi f917d4ac09 页面优化 2018-05-15 17:29:31 +08:00
尹吉欢 28dbe98576 Merge branch 'master' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-15 17:17:41 +08:00
虞继恩 b5ea3a98c8 Merge branch 'YOUFANGAPP1.1.1' into 'master'
Youfangapp1.1.1

See merge request !4
2018-05-15 17:17:04 +08:00
bayi 7eb2c58df6 Merge branch 'YOUFANGAPP1.1.2' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-15 17:00:23 +08:00
bayi ee9667649b 页面优化 2018-05-15 16:56:03 +08:00
xuhe@fangjia.com 906d1e76bf Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into xh-YOUFANGAPP1.1.2
# Conflicts:
#	fangija-zsyf/css/main.css
2018-05-15 15:32:22 +08:00
zongzhimin 2bd6d06878 YOUFANG1.0.4 城市报告 2018-05-15 15:29:48 +08:00
zongzhimin 96048dc1e0 YOFUANG1.0.5 城市报告 2018-05-15 15:29:46 +08:00
raoyanhui 8426068758 调整资产排名 页面加载效果 2018-05-15 15:29:44 +08:00
raoyanhui a4853fec6d 调整资产排名 2018-05-15 15:29:42 +08:00
bayi 24a85233cc 下拉刷新相关 2018-05-15 15:29:39 +08:00
raoyanhui 3b53109d4e 调整资产排名页面跳转判断方式 2018-05-15 15:29:38 +08:00
raoyanhui f72d786abd clicked('/views/user/assetsLevel.html',true,false,{},{},function(){}) 2018-05-15 15:29:37 +08:00
raoyanhui df58f48a8c 提交 我的资产排名 2018-05-15 15:29:36 +08:00
raoyanhui 550c1e7ff1 提交 我的资产排名 2018-05-15 15:29:36 +08:00
raoyanhui c7a311917d 提交 我的资产排名 2018-05-15 15:29:34 +08:00
raoyanhui 8793de53f9 重置全局变量, 修改之前的bug 2018-05-15 15:29:34 +08:00
zongzhimin edeb39ed78 YOUFANG1.0.5 城市报告 2018-05-15 15:29:32 +08:00
raoyanhui ad12dcaad4 调整资产排名js 2018-05-15 15:29:31 +08:00