修改带看校验

src/view/scene/Initiator.vue

@@ -45,13 +45,14 @@ export default {
   },
   computed: {
     url() {
-      let ssurl = sessionStorage.getItem('initiator')
+      let ssurl = localStorage.getItem('initiator')
       const {sceneNum,id} = this.$route.query
-      console.log('VUE_APP_DOMAIN',process.env.VUE_APP_DOMAIN)
+      console.log('url参数',ssurl,'sceneNum,id',sceneNum,id)
       if(ssurl){
         return process.env.VUE_APP_DOMAIN + '/fire-rtc-live.html' + ssurl.substr(ssurl.indexOf('?') || 0)
       }
       if (sceneNum && id) {
+      console.log('url参数',process.env.VUE_APP_DOMAIN + '/fire-rtc-live.html?m=' + sceneNum +'&app=fire-control&p_id='+id+'&vlog#/')
         return process.env.VUE_APP_DOMAIN + '/fire-rtc-live.html?m=' + sceneNum +'&app=fire-control&p_id='+id+'&vlog#/'
       } else {
           console.log('url获取=>',this.$route)
@@ -108,15 +109,15 @@ export default {
         if(event.data){
             const {liveStatus,url} = event.data
             if(url){
-              sessionStorage.setItem('initiator',url)//保存url
+              console.log('建立链接url参数===>',url)
+              localStorage.setItem('initiator',url)//保存url
               let { roomId } = getQueryString(url)
-              console.log('建立链接url参数===>',roomId)
               that.roomId = roomId
               roomId&&that.setStateLine(true)
             }
             if(liveStatus == 0){//已结束
-                console.log('已结束===>',event)
-                sessionStorage.removeItem('initiator')
+                console.log('url参数===>',event)
+                localStorage.removeItem('initiator')
                 that.setStateLine(false)
             }
         }
@@ -142,7 +143,7 @@ export default {
   },
   beforeDestroyed(){
     window.removeEventListener("message", this.handleMessage);
-    sessionStorage.removeItem('initiator')
+    localStorage.removeItem('initiator')
   },
   components: {
     "com-dialog": comDialog,

src/view/scene/visitor.vue

@@ -46,7 +46,7 @@ export default {
   computed: {
     url() {
       let ssurl =  window.location.hash.substr(window.location.hash.indexOf('?') || 0)
-      let dataurl = sessionStorage.getItem('visitorurl')
+      let dataurl = localStorage.getItem('visitorurl')
     //   console.log('dataurl',dataurl,dataurl.substr(dataurl.indexOf('?') || 0))
       if(dataurl){
         return process.env.VUE_APP_DOMAIN + '/fire-rtc-live.html' + dataurl.substr(dataurl.indexOf('?') || 0)
@@ -107,9 +107,9 @@ export default {
         var that = this
         if(event.data){
             const {liveStatus,url} = event.data
-            url&&sessionStorage.setItem('visitorurl',url)
+            url&&localStorage.setItem('visitorurl',url)
             if(liveStatus == 0){//已结束
-                sessionStorage.removeItem('visitorurl')
+                localStorage.removeItem('visitorurl')
                 let isOk = await this.$alert(
                     "带看已结束",
                     "确定"
@@ -121,31 +121,38 @@ export default {
                     }
                 );
                 if(isOk){
-                  if(that.token){
-                    that.$router.push({name: 'home'})
-                  }else{
                     window.location.href = 'noAccess.html'
-                  }
                 }
             }
         console.log('handleMessage===>',event.data)
         }
     },
     async lineCheck(){
-      let { roomId } = getQueryString(this.url)
-      if(!this.token){
-        window.location.href = 'noAccess.html'
-        return 
-      }
+      var that = this
+      let { roomId, } = getQueryString(this.url)
       let {data} = await axios.get(onLineCheck, {params:{roomId}})
       console.log('房间号不存在===>',data)
-      if(data.error){
-          window.location.href = 'noAccess.html'
+      if(data.error || data.isTrue){
+          let isOk = await this.$alert(
+              "带看已结束",
+              "确定"
+              ,{  
+                  customClass:that.modelType?'messageMobile':'',
+                  showClose:false,
+                  showCancelButton:false,
+                  closeOnClickModal:false,
+              }
+          );
+          if(isOk){
+            if(data.error) return window.location.href = 'noAccess.html'
+            const search = getQueryString(window.location.hash)
+            this.$router.replace({name: 'sceneInitiator', query: {sceneNum:search['#/sceneVisitor?m'],id: search.p_id}})
+          }
       }
     }
   },
   mounted() {
-    this.lineCheck()
+    this.lineCheck() 
     if((navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i))) {
 				this.modelType = true
 			}
@@ -165,7 +172,7 @@ export default {
   },
   beforeDestroyed(){
     window.removeEventListener("message", this.handleMessage);
-    sessionStorage.removeItem('visitorurl')
+    localStorage.removeItem('visitorurl')
   },
   components: {
     "com-dialog": comDialog,

vue.config.js

@@ -19,8 +19,8 @@ module.exports = {
     // 设置代理proxy
     proxy: {
       '/__api': {
-        // target: 'http://192.168.0.135:8585/',
-        target: 'https://testxfhd.4dkankan.com',
+        target: 'http://192.168.0.135:8585/',
+        // target: 'https://testxfhd.4dkankan.com',
         // target: 'https://testhuodiao.4dkankan.com/',
         changeOrigin: true,  
         pathRewrite: {