From 6abbddea58c8ad66974f043ff0215dbc0a2a3527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 5 Sep 2021 01:35:09 +0800
Subject: [PATCH] =?UTF-8?q?iframe=E9=AB=98=E5=BA=A6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/layouts/IframePageView.vue   | 10 +++++++---
 jshERP-web/src/mixins/JeecgListMixin.js         | 17 +++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/jshERP-web/src/components/layouts/IframePageView.vue b/jshERP-web/src/components/layouts/IframePageView.vue
index ce32766f..d62f50d7 100644
--- a/jshERP-web/src/components/layouts/IframePageView.vue
+++ b/jshERP-web/src/components/layouts/IframePageView.vue
@@ -5,12 +5,12 @@
 <script>
   import Vue from 'vue'
   import { ACCESS_TOKEN } from "@/store/mutation-types"
-  import PageLayout from '../page/PageLayout'
-  import RouteView from './RouteView'
+  import {mixinDevice} from '@/utils/mixin.js'
 
   export default {
     name: "IframePageContent",
     inject:['closeCurrent'],
+    mixins: [mixinDevice],
     data () {
       return {
         url: "",
@@ -33,7 +33,11 @@
       goUrl () {
         let url = this.$route.meta.url
         this.id = this.$route.path
-        this.height = document.documentElement.clientHeight-130
+        if (this.isMobile()) {
+          this.height = 800
+        } else {
+          this.height = document.documentElement.clientHeight-130
+        }
         console.log("------url------"+url)
         console.log("------token------"+Vue.ls.get(ACCESS_TOKEN))
         if (url !== null && url !== undefined) {
diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js
index 13f84bb0..a53cd220 100644
--- a/jshERP-web/src/mixins/JeecgListMixin.js
+++ b/jshERP-web/src/mixins/JeecgListMixin.js
@@ -61,7 +61,6 @@ export const JeecgListMixin = {
     }
   },
   created() {
-    this.initScroll()
     if(!this.disableMixinCreated){
       //console.log(' -- mixin created -- ')
       this.loadData();
@@ -69,16 +68,11 @@ export const JeecgListMixin = {
       this.initDictConfig();
       //初始化按钮权限
       this.initActiveBtnStr();
+      //初始化列表横向或纵向滚动
+      this.initScroll()
     }
   },
   methods:{
-    initScroll() {
-      if (this.isMobile()) {
-        this.scroll.y = ''
-      } else {
-        this.scroll.y = document.documentElement.clientHeight-330
-      }
-    },
     loadData(arg) {
       if(!this.url.list){
         this.$message.error("请设置url.list属性!")
@@ -362,6 +356,13 @@ export const JeecgListMixin = {
           }
         }
       }
+    },
+    initScroll() {
+      if (this.isMobile()) {
+        this.scroll.y = ''
+      } else {
+        this.scroll.y = document.documentElement.clientHeight-330
+      }
     }
   }