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

dsk-operate-ui/src/views/detail.vue

@@ -35,7 +35,7 @@ export default {
       this.domain='https://plug.jiansheku.com'
     }else {
       this.domain='https://pre-plug.jiansheku.com'
-      // this.domain='http://192.168.60.210:3400'
+      this.domain='http://192.168.60.210:3400'
     }
     this.gettokens();
   },
@@ -43,7 +43,7 @@ export default {
     this.iframeLoading(); // 判断iframe页面是否加载完成-当前页控制
     let that = this
     window.addEventListener('message', function (event) {
-      if(event.data.url){
+      if(!event.data.id && event.data.url){
         that.$tab.openPage(event.data.title, event.data.url).then(() => {
         // 执行结束的逻辑
         })

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

@@ -52,19 +52,24 @@ export default {
     window.addEventListener("message", this.pagecapListener, { passive: true });
     window.addEventListener('message', function (event) {
       if(event.data.id){
-        getUipIdByCid([event.data.id]).then(res=>{
-        if (res.code==200) {
-          console.log(res)
-          if(res.data&&res.data.length>0&&res.data[0].uipId){
-            that.$router.push({path: '/enterprise/'+that.encodeStr(event.data.id)})
-          }else{
-            that.$tab.openPage(event.data.title, '/company/'+event.data.id)
+          getUipIdByCid([event.data.id]).then(res=>{
+          if (res.code==200) {
+            if(res.data&&res.data.length>0&&res.data[0].uipId){
+              that.$router.push({path: '/enterprise/'+that.encodeStr(event.data.id)})
+            }else{
+              that.$tab.openPage(event.data.title, '/company/'+that.encodeStr(event.data.id))
+            }
+
           }
+        }).catch(error=>{
 
+        });
+      }else{
+        if(event.data.url){
+          that.$tab.openPage(event.data.title, event.data.url).then(() => {
+          // 执行结束的逻辑
+          })
         }
-      }).catch(error=>{
-
-      });
       }
 
     }, false);