backupversion

src/api/index.js

@@ -236,17 +236,6 @@ export function saveInitScreen(data, ok, no) {
     return http.get(`${URL_FILL}/manage/scene/detail/${scene()}`, {}, ok, no)
 }
 
-/**
- * 获取所有场景列表(展示端)
- * @param {*} data 
- * @param {*} ok 
- * @param {*} no 
- */
- export function getAllVrList(data, ok, no) {
-    return http.get(`${URL_FILL}/manage/scene/findByWork/${number()}`, data, ok, no)
-}
-
-
 
 /**
  * 获取场景分组列表(展示端)
@@ -317,7 +306,15 @@ export function saveInitScreen(data, ok, no) {
 
 
 
-
+/**
+ * 查询该作品是否存在场景
+ * @param {*} data 
+ * @param {*} ok 
+ * @param {*} no 
+ */
+ export function getAllVrList(data, ok, no) {
+    return http.get(`${URL_FILL}/manage/scene/findByWork/${number()}`, data, ok, no)
+}
 
 
 

src/components/table/style.less

@@ -17,6 +17,7 @@
       text-align: left;
       padding-right: 10px;
       display: inline-block;
+      margin-right: 10px;
     }
   }
   .t-con{
@@ -45,6 +46,7 @@
         text-align: left;
         display: inline-block;
         box-sizing: content-box;
+        margin-right: 10px;
         span{
           word-break: break-all;
           color: #909090;

src/framework/show/index.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="panocon">
     <template v-if="showInfo">
-      <div id="pano"></div>
+      <iframe  v-if="activeItem.type=='4dkk'" 
+      :src="`https://test.4dkankan.com/spc.html?m=${activeItem.sceneCode}`" frameborder="0"></iframe>
+      <div v-show="activeItem.type!='4dkk'" id="pano"></div>
+
       <div class="pano-logo" v-if="showInfo.logo && showInfo.isLogo">
         <img :src="showInfo.logo" alt="" />
       </div>
@@ -181,8 +184,6 @@ export default {
             }
           }
           newVal.isPassword ? (this.showPassword = true) : this.startLoad();
-        } else {
-          console.log();
         }
       },
     },
@@ -263,6 +264,10 @@ export default {
     width: 100%;
     height: 100%;
   }
+  >iframe{
+    width: 100%;
+    height: 100%;
+  }
   .pano-logo {
     position: absolute;
     top: 20px;

src/framework/show/list.vue

@@ -73,10 +73,11 @@ export default {
   },
   watch:{
     taboneActive:{
-      deep:true,
       handler:function (newVal) {
         if (newVal.children.length>0) {
+          this.tabtowActive=''
           this.tabtowActive = newVal.children[0]
+          return
         }
         if (newVal.id) {
           this.getTabSceneList(newVal.id)
@@ -84,7 +85,6 @@ export default {
       }
     },
     tabtowActive:{
-      deep:true,
       handler:function (newVal) {
         if (newVal.id) {
           this.getTabSceneList(newVal.id)
@@ -111,8 +111,10 @@ export default {
       }
     },
     selected:{
-      handler:function () {
-        
+      handler:function (newVal) {
+        if (newVal.type == '4dkk') {
+          this.showList = false
+        }
       }
     }
   },
@@ -161,12 +163,13 @@ export default {
   z-index: 999;
   text-align: center;
   width: 100%;
+  pointer-events: none;
   .dl{
     background: rgba(0, 0, 0, 0.3);
     border-radius: 18px;
     border: 1px solid rgba(255, 255, 255, 0.2);
     margin-top: 10px;
-
+    pointer-events: auto;
     >i{
       margin-right: 8px;
       vertical-align: bottom;
@@ -178,6 +181,7 @@ export default {
     transition: all ease 0.3s;
     max-height: 0px;
     overflow: hidden;
+    pointer-events: auto;
     ul{
       justify-content: center;
       align-items: center;

src/views/material/audio/audio.js

@@ -3,7 +3,8 @@ let data = [
     key: 'ossPath',
     name: '素材',
     en: '素材',
-    type:'audio'
+    type:'audio',
+    width:100
   },
   {
     key: 'name',

src/views/material/popup/preview.vue

@@ -8,12 +8,13 @@
           </span>
         </div>
         <div class="ui-message-main">
-          <template v-if="item.type=='pano'||item.type=='image'">
+          <template v-if="item.type=='image'">
              <img @click.stop class="v-image"  v-viewer :src="item[typeStr[item.type]]"/>
              <span class="scale" @click="viewImg">
                <img :src="require('@/assets/images/icons/tool_full@2x.png')" alt="">
              </span>
           </template>
+          <iframe v-else-if="item.type=='pano'" :src="'./vr.html?vr='+item.sceneCode" frameborder="0"></iframe>
           <video v-else controls autoplay :src="item.ossPath"></video>
         </div>
       </div>
@@ -62,7 +63,7 @@ export default {
     width: 100%;
     font-size: 0;
     position: relative;
-    >img,>video{
+    >img,>video,>iframe{
       width: 100%;
       height: 540px;
     }