Commits · master · xingyuji / house-type

17 Sep, 2020 1 commit
- fix: 修复手机端“地图中圆球不能触摸点击”问题 · e69841a7
  Breaker-93 authored Sep 17, 2020
  
  e69841a7
16 Sep, 2020 2 commits
- Merge branch 'develop' into 'master' · ee6d3a64
  xingyuji authored Sep 16, 2020
```
fix: 供求比例改为0.xx、供销比改为0.x

See merge request !60
```
  ee6d3a64
- fix: 供求比例改为0.xx、供销比改为0.x · b6b74984
  wangjiankun authored Sep 16, 2020
  
  b6b74984
14 Sep, 2020 2 commits
- 多级表头表格翻页图标修改 · 0c170fec
  wangjiankun authored Sep 14, 2020
  
  0c170fec
- Merge branch 'develop' into 'master' · c933feb6
  xingyuji authored Sep 14, 2020
```
多级表头表格翻页图标修改

See merge request !59
```
  c933feb6
11 Sep, 2020 3 commits
- Merge branch 'develop' into 'master' · ca808529
  xingyuji authored Sep 11, 2020
```
Develop

See merge request !58
```
  ca808529
- Merge branch 'master' of ssh://103.249.252.28:10022/xingyuji/house-type into develop · 9497a54c
  wangjiankun authored Sep 11, 2020
  
  9497a54c
- fix：多级表头分页图标样式修改楼盘详情柱状图宽度调整 · e313d997
  wangjiankun authored Sep 11, 2020
  
  e313d997
03 Sep, 2020 4 commits
- Merge branch 'develop' into 'master' · 23dd5521
  xingyuji authored Sep 03, 2020
```
fix：楼盘详情-面宽柱状图调整最大宽度与最小宽度

See merge request !57
```
  23dd5521
- fix：楼盘详情-面宽柱状图调整最大宽度与最小宽度 · abca9339
  wangjiankun authored Sep 03, 2020
  
  abca9339
- Merge branch 'develop' into 'master' · 223faed4
  xingyuji authored Sep 03, 2020
```
fix：楼盘详情-面宽柱状图， x轴刻度名称换行显示

See merge request !56
```
  223faed4
- fix：楼盘详情-面宽柱状图， x轴刻度名称换行显示 · 63a56804
  wangjiankun authored Sep 03, 2020
  
  63a56804
02 Sep, 2020 5 commits
- Merge branch 'develop' into 'master' · caf9e637
  xingyuji authored Sep 02, 2020
```
Develop

See merge request !55
```
  caf9e637
- fix：修改密码 · ea96c9db
  wangjiankun authored Sep 02, 2020
  
  ea96c9db
- fix：权限容积率、成交总价权限 · d6f65b16
  wangjiankun authored Sep 02, 2020
  
  d6f65b16
- fix：权限容积率、成交总价权限 · 0702252d
  wangjiankun authored Sep 02, 2020
  
  0702252d
- Merge branch 'master' of ssh://103.249.252.28:10022/xingyuji/house-type into develop · 0c46101d
  wangjiankun authored Sep 02, 2020
  
  0c46101d
01 Sep, 2020 1 commit
- fix: 密码修改限制最小5位 · 948c4d83
  Breaker-93 authored Sep 01, 2020
  
  948c4d83
23 Aug, 2020 1 commit
- feat: 添加“修改密码”功能 · 458db746
  Breaker-93 authored Aug 23, 2020
  
  458db746
21 Aug, 2020 4 commits
- fix：修复 · fd148572
  wangjiankun authored Aug 21, 2020
  
  fd148572
- Merge branch 'develop' into 'master' · 6422949c
  xingyuji authored Aug 21, 2020
```
fix:修改titile

See merge request !54
```
  6422949c
- Merge remote-tracking branch 'origin/develop' into develop · 572a3992
  wangjiankun authored Aug 21, 2020
  
  572a3992
- fix：修改title 产品分析、产品供求数据截至到2014年 · 82817085
  wangjiankun authored Aug 21, 2020
  
  82817085
20 Aug, 2020 10 commits
- Merge remote-tracking branch 'origin/develop' into develop · c95b737f
  super_liu authored Aug 20, 2020
  
  c95b737f
- Merge branch 'develop' into 'master' · 84edcff0
  xingyuji authored Aug 20, 2020
```
feat:登录session 添加 用户权限 access

See merge request !53
```
  84edcff0
- Merge branch 'develop' into 'master' · 99749ff9
  xingyuji authored Aug 20, 2020
```
Develop

See merge request !52
```
  99749ff9
- Merge remote-tracking branch 'origin/develop' into develop · 732c2034
  wangjiankun authored Aug 20, 2020
  
  732c2034
- fix: 导出、下载技术资料添加权限按钮 · c9091069
  wangjiankun authored Aug 20, 2020
  
  c9091069
- feat:登录session 添加用户权限 access · 78adffdf
  super_liu authored Aug 20, 2020
  
  78adffdf
- Merge branch 'develop' into 'master' · e978d64c
  xingyuji authored Aug 20, 2020
```
feat:企业登录

See merge request !51
```
  e978d64c
- feat:企业登录 · d521e5a5
  super_liu authored Aug 20, 2020
  
  d521e5a5
- Merge remote-tracking branch 'origin/develop' into develop · 59d1f69c
  super_liu authored Aug 20, 2020
```
# Conflicts:
#	src/views/Login.vue
```
  59d1f69c
- feat:企业登录 · c5cc3d58
  super_liu authored Aug 20, 2020
  
  c5cc3d58
19 Aug, 2020 4 commits
- fix：修复头像与搜索框错位的问题 · 6fc39822
  wangjiankun authored Aug 19, 2020
  
  6fc39822
- Merge branch 'develop' into 'master' · 08598ae0
  xingyuji authored Aug 19, 2020
```
fix：修复头像与搜索框错位的问题

See merge request !50
```
  08598ae0
- Merge branch 'develop' into 'master' · b206df9f
  xingyuji authored Aug 19, 2020
```
Develop

See merge request !49
```
  b206df9f
- fix: 路由名称修改 · 35945966
  wangjiankun authored Aug 19, 2020
```
fix: 图片修复
```
  35945966
18 Aug, 2020 3 commits
- fix: 登陆页面修改 · db987416
  wangjiankun authored Aug 18, 2020
  
  db987416
- Merge remote-tracking branch 'origin/develop' into develop · 52740985
  wangjiankun authored Aug 18, 2020
```
# Conflicts:
#	src/views/Login.vue
```
  52740985
- fix: 样式修复 · 01fbed36
  wangjiankun authored Aug 18, 2020
  
  01fbed36