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

# Conflicts:
#	dsk-operate-ui/src/views/market/index.vue

dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue

@@ -354,7 +354,7 @@ export default {
   methods: {
     financial(id) {
       financial({ cid: String(id) }).then(res => {
-        if (res.code == 200 && !res.data) {
+        if ((res.code == 200 && !res.data) || !res.data?.totalAssets) {
           this.sideRoute[1].disabled = true;
           this.defaultRoute = JSON.parse(JSON.stringify(this.sideRoute));
         }

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

@@ -32,7 +32,7 @@ export default {
       timelongs: 7200,//刷新token时间
       tokentimer: null,
       showMaxPageTip: false,
-      iframeIns : null,
+      iframeIns: null,
     };
   },
   created() {
@@ -41,6 +41,7 @@ export default {
     } 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();
@@ -49,7 +50,6 @@ export default {
   mounted() {
     this.iframeLoading(); // 判断iframe页面是否加载完成-当前页控制
     // steerScroll('companyIframe', this.navigation, this.footHeight, true); // iframeId: iframe的id；navigation:页面排除iframe后剩下的顶部高度；footHeight: 页面排除iframe后剩下的底部高度；state:监听or移除监听；parentId: 父级id[不带默认就是铺满整个页面]];_this:指向当前实例（可忽略）
-    console.log(document.querySelector(".market-iframe").contentWindow.document.documentElement.scrollHeight);
   },
   beforeDestroy() {
     clearInterval(this.iframeTimer); // -当前页控制
@@ -57,7 +57,7 @@ export default {
     clearInterval(this.tokentimer);
     window.removeEventListener("message", this.pagecapListener, { passive: true });
     // 移除layout样式
-    this.iframeIns.contentWindow.postMessage("",{})
+    this.iframeIns.contentWindow.postMessage("removeHtmlLayoutStyle", { targetOrigin: this.domain, });
   },
   methods: {
     async iframeObserver() {
@@ -71,7 +71,7 @@ export default {
     // 列表翻页上限
     pagecapListener(e) {
       const { origin, data } = e;
-      if (origin.indexOf(this.domain) < 0) return;
+      if (origin != this.domain) return;
       if (data == "pageCurrentMaxSize") {
         this.showMaxPageTip = true;
       }