210203

public/edit.html

@@ -12,7 +12,6 @@
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/quill/quill.snow.css"/>
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/mCustomScrollbar/jquery.mCustomScrollbar.min.css"/>
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/scrollbar/perfect-scrollbar.css"/>
-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/scrollbar/perfect-scrollbar.css"/>
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/webuploader/webuploader.css"/>
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/swiper/swiper.min.css"/>
     <title>VR楼盘项目编辑器</title>

public/show.html

@@ -11,7 +11,6 @@
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/quill/quill.snow.css"/>
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/mCustomScrollbar/jquery.mCustomScrollbar.min.css"/>
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/scrollbar/perfect-scrollbar.css"/>
-    <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/scrollbar/perfect-scrollbar.css"/>
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/webuploader/webuploader.css"/>
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/swiper/swiper.min.css"/>
     <title>VR楼盘</title>

src/components/select.vue

@@ -123,8 +123,7 @@ props:{
     Paging
   },
   watch:{
-    houseSelect(newVal){
-      console.log(newVal);
+    houseSelect(){
     }
   },
   data () {

src/components/shared/Combox.vue

@@ -58,7 +58,6 @@ export default {
             if (this.selectedIndex == index) {
                 return this.$emit("click", item, index);
             }
-            console.log(item,index);
             this.$emit("change", item, index);
         }
     }

src/components/shared/uploads/UploadVideo.vue

@@ -80,7 +80,6 @@ export default {
             }
 
             getPoster(this.dataURL).then(poster => {
-                console.log(1111111111111111111)
                 this.base64 = poster
                 file.poster = this.base64;
                 this.$emit("file-change", file);

src/core/utils.js

@@ -126,13 +126,12 @@ export default class Utils {
    * 打开热点链接
    */
 
-  linkopen(link,id){
+  linkopen(sceneCode,id){
     if (window.location.pathname.indexOf('edit')>-1) {
       vue.$bus.emit('openHotspot',id)
     }
     else{
-      // window.open(link,'_self')
-      window.parent.postMessage(link,'*')
+      window.parent.postMessage({ event: 'hotspot', targetCode: sceneCode },'*')
     }
    
   }

src/framework/show/index.vue

@@ -32,16 +32,19 @@ export default {
 
         $('#pano').empty();
         window.vrInitFn = ()=>{
-              var krpano = document.getElementById('krpanoSWFObject');
+            window.parent.postMessage({ event: 'loadcomplete', targetCode: newVal.sceneCode },'*')
+            var krpano = document.getElementById('krpanoSWFObject');
             __krfn.utils.initHotspot(krpano,newVal&&newVal.someData,false);
         }
         window.vrViewFn = ()=>{
-          if (newVal.initVisual) {
-            let tmp = JSON.parse(newVal.initVisual)
-            var krpano = document.getElementById('krpanoSWFObject');
-            krpano.set('view.vlookat',tmp.vlookat);
-            krpano.set('view.hlookat',tmp.hlookat);
-          }
+          try {
+              let tmp = JSON.parse(newVal.initVisual)
+              var krpano = document.getElementById('krpanoSWFObject');
+              krpano.set('view.vlookat',tmp.vlookat);
+              krpano.set('view.hlookat',tmp.hlookat);
+            } catch (error) {
+              error
+            }
         }
         var settings = {
           'events[skin_events].onxmlcomplete':'js(window.vrViewFn());',

src/utils/file.js

@@ -89,7 +89,6 @@ export const base64ToBlob = base64 => {
 }
 
 export const base64ToDataURL = base64 => {
-    console.log(window.URL.createObjectURL(base64ToBlob(base64)));
     return window.URL.createObjectURL(base64ToBlob(base64));
 }
 

src/utils/request.js

@@ -34,6 +34,8 @@ export const statusCode = {
  */
 // const defineErrorCode = []
 
+let __showNetworkError = false
+
 const showLoginTips = () => {
     // 防止多次请求弹出
     if (showLoginTips.__is_show) {
@@ -114,7 +116,16 @@ $.ajaxSetup({
         }
     },
     error: function() { // 出错时默认的处理函数
-        return $alert({content: '网络异常，请稍后再试'})
+        if (__showNetworkError) {
+            return
+        }
+        __showNetworkError = true
+        $alert({content: '网络异常，请稍后再试',
+                forceOK:true,
+                ok:()=>{
+                    __showNetworkError = false
+            }})
+        return 
     },
     success: function() {
 

src/views/hotspot/EditPanel.vue

@@ -141,7 +141,6 @@ export default {
 
   methods: {
     listerFn(data){
-      console.log(111111)
       this.selectItem = {
         sceneCode: data.sceneCode
       }

src/views/hotspot/index.vue

@@ -29,7 +29,7 @@
                   <img :src="item.icon" alt="">
                 </div>
                 <div class="ui-title">
-                  <span>{{ item.fileName }}</span>
+                  <span>{{item.type=='house'?item.roomName:item.sceneTitle}}</span>
                 </div>
               </li>
             </ul>

src/views/information/Toolbar.vue

@@ -29,7 +29,7 @@
                 </ul>
               </div>
               <div class="ui-title">
-                <span>{{item.sceneTitle}}</span>
+                <span>{{item.type=='house'?item.roomName:item.sceneTitle}}</span>
               </div>
             </li>
           </draggable>
@@ -207,6 +207,7 @@ export default {
   .pano-label{
     .pano-con{
       padding: 0;
+      height: calc(100vh - 250px);
       >ul{
         max-height: calc(100% - 10px);
         overflow-y: auto;

src/views/information/index.vue

@@ -32,7 +32,7 @@
                   <img :src="item.icon" alt="">
                 </div>
                 <div class="ui-title">
-                  <span>{{ item.sceneTitle }}</span>
+                  <span>{{item.type=='house'?item.roomName:item.sceneTitle}}</span>
                 </div>
               </li>
             </ul>
@@ -226,7 +226,6 @@ export default {
               );
             } 
             this.houseDataActive = this.houseNameList[this.houseActive];
-
           }
         );
       }
@@ -334,6 +333,7 @@ export default {
           {
             icon: this.huxing.thumb,
             roomId: (this.houseDataActive&&this.houseDataActive.id),
+            roomName: (this.houseDataActive&&this.houseDataActive.name),
             id: this.currentId || null,
             sceneTitle: this.huxing.sceneName,
             vrModelId: this.huxing.id,