Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-operate-ui/src/assets/styles/index.scss

@@ -231,9 +231,9 @@ li {
 }
 .app-container {
   width: 100%;
-  margin: 12px 24px;
+  padding: 16px 24px;
   background-color: #f5f5f5;
-  padding-bottom: 16px !important;
+  box-sizing: border-box;
   .el-input__inner {
     border-color: #d9d9d9;
     color: #232323;

dsk-operate-ui/src/assets/styles/project.scss

 .el-card{
   overflow: initial;
 }
-.app-container{
-  padding: 0;
-}
 //小导航
 .miantitle{
   color: #232323;

dsk-operate-ui/src/assets/styles/public.scss

@@ -1222,8 +1222,7 @@ select {
 	color: #232323;
   }
 .enterprise_contatiner{
-	padding: 0;
-	padding-bottom: 16px;
+
 }
 .el-input-group__append{
 	cursor: pointer;

dsk-operate-ui/src/views/market/index.vue

@@ -32,6 +32,7 @@ export default {
       timelongs: 7200,//刷新token时间
       tokentimer: null,
       showMaxPageTip: false,
+      iframeIns : null,
     };
   },
   created() {
@@ -39,9 +40,10 @@ export default {
       this.domain = 'https://plug.jiansheku.com';
     } else {
       this.domain='https://pre-plug.jiansheku.com'
-      // this.domain='http://192.168.60.8:3400'
+      // this.domain = 'http://192.168.60.104:3400';
     }
     this.gettokens();
+    this.iframeObserver();
     window.addEventListener("message", this.pagecapListener, { passive: true });
   },
   mounted() {
@@ -54,8 +56,18 @@ export default {
     steerScroll('companyIframe', this.navigation, this.footHeight); // iframeId: iframe的id；navigation:页面排除iframe后剩下的顶部高度；footHeight: 页面排除iframe后剩下的底部高度；state:监听or移除监听；parentId: 父级id[不带默认就是铺满整个页面]];_this:指向当前实例（可忽略）
     clearInterval(this.tokentimer);
     window.removeEventListener("message", this.pagecapListener, { passive: true });
+    // 移除layout样式
+    this.iframeIns.contentWindow.postMessage("",{})
   },
   methods: {
+    async iframeObserver() {
+      try {
+        await this.$nextTick();
+        this.iframeIns = document.querySelector(".market-iframe");
+      } catch (error) {
+        console.log(error);
+      }
+    },
     // 列表翻页上限
     pagecapListener(e) {
       const { origin, data } = e;