Commit Graph

1103 Commits

Author SHA1 Message Date
xuhe@fangjia.com df6546aaf1 Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into xh-YOUFANGAPP1.1.2 2018-05-21 18:05:46 +08:00
xuhe@fangjia.com 68dae3d448 aa 2018-05-21 18:05:39 +08:00
gaojuan 22ab0623f4 Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-21 17:55:43 +08:00
gaojuan ba2a967b7e fixbug 2018-05-21 17:55:32 +08:00
bayi 5a37f2056b Merge branch 'YOUFANGAPP1.1.2' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-21 15:53:59 +08:00
bayi 10068f7bb2 电话号码显示优化 2018-05-21 15:53:54 +08:00
xuhe@fangjia.com f6f16e8976 Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into xh-YOUFANGAPP1.1.2 2018-05-21 15:11:57 +08:00
xuhe@fangjia.com 7eaa5c0e31 热门推荐 2018-05-21 15:11:49 +08:00
gongjin 4aafba8b8b Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-21 15:10:45 +08:00
gongjin 43808a73af 输入框样式update 2018-05-21 15:10:38 +08:00
xuhe@fangjia.com 92b2320a5a Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into xh-YOUFANGAPP1.1.2 2018-05-21 14:55:19 +08:00
xuhe@fangjia.com e5908f8995 aa 2018-05-21 14:55:13 +08:00
xuhe@fangjia.com 0870abf76f bug 2018-05-21 14:54:31 +08:00
尹吉欢 e5e4775c52 Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-21 14:48:28 +08:00
尹吉欢 ff5d645b48 分享标题修改 2018-05-21 14:48:16 +08:00
gaojuan 970302a1bb Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-21 12:03:34 +08:00
gaojuan af3430db07 圆环去掉动态效果 2018-05-21 12:03:24 +08:00
尹吉欢 2ae669abb1 Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-21 12:01:46 +08:00
尹吉欢 8bdb72b8e7 合并 2018-05-21 12:01:35 +08:00
尹吉欢 8f0b69f6fc 推送打开app中二级页面功能 2018-05-21 11:56:22 +08:00
bayi fcebe75c47 Merge branch 'YOUFANGAPP1.1.2' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-21 10:55:08 +08:00
bayi b82d4541a2 代码优化,解决手机号不显示的问题 2018-05-21 10:55:03 +08:00
gaojuan 729ff06b8d Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-21 10:10:42 +08:00
gaojuan f450080e86 潜力排行暂无数据 2018-05-21 10:10:32 +08:00
gongjin b35cb66077 Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.2 2018-05-18 18:32:48 +08:00
gongjin 3fa03eb778 样式update 2018-05-18 18:32:16 +08:00
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