diff --git a/src/js/store/modules/app.js b/src/js/store/modules/app.js
index b9a493a9..4384a1c1 100644
--- a/src/js/store/modules/app.js
+++ b/src/js/store/modules/app.js
@@ -5,13 +5,15 @@ export default {
clientHeight: document.documentElement.clientHeight,
size: 'medium',
resolution: 'medium',
- env: 'dev'
+ env: 'dev',
+ iframeHeight:120
},
getters: {
clientHeight: (state) => state.clientHeight,
size: (state) => state.size,
resolution: (state) => state.resolution,
- env: (state) => state.env
+ env: (state) => state.env,
+ iframeHeight: (state) => state.iframeHeight
},
mutations: {
[type.client_height](state, payload) {
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index f8e3dab5..342ef30f 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -235,11 +235,11 @@ export default {
computed: {
tableHeight () {
- return (this.clientHeight - 300)
+ return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
},
- ...mapGetters(['clientHeight'])
+ ...mapGetters(['clientHeight', 'iframeHeight'])
},
methods: {
//重置搜索条件
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 7f91ed38..1708c943 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -307,7 +307,7 @@ export default {
.div_table {
margin-left: 15px;
// flex: 1;
- width: calc(100vw - 550px);
+ width: calc(100% - 300px);
background-color: #ffffff;
border-radius: 5px;
padding: 10px;
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index cbe00837..27660e25 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -285,13 +285,13 @@ export default {
},
computed: {
tableHeight () {
- return (this.clientHeight - 300)
+
+ return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
+
},
- rowHeight () {
- return (this.clientHeight - 200) + 'px'
- },
- ...mapGetters(['clientHeight'])
+
+ ...mapGetters(['clientHeight', 'iframeHeight'])
},
methods: {
//重置搜索条件
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 09909c8a..92710ca2 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -131,7 +131,7 @@
@click="handleDetail(scope.row)">查看