tremble 2 سال پیش
والد
کامیت
f29bd06779
49فایلهای تغییر یافته به همراه154 افزوده شده و 90 حذف شده
  1. 5 5
      packages/qjkankan-editor/src/components/materialSelectorForEditor.vue
  2. 5 5
      packages/qjkankan-editor/src/components/materialSelectorForManageCenter.vue
  3. 2 2
      packages/qjkankan-editor/src/components/materialSelectorFromWorkForEditor.vue
  4. 2 1
      packages/qjkankan-editor/src/components/shared/uploads/UploadMultiple.vue
  5. 0 1
      packages/qjkankan-editor/src/components/table/style.less
  6. 1 0
      packages/qjkankan-editor/src/framework/play/pano/index.vue
  7. 0 1
      packages/qjkankan-editor/src/pages/Material.vue
  8. 3 0
      packages/qjkankan-editor/src/views/base/Toolbar.vue
  9. 3 1
      packages/qjkankan-editor/src/views/hotspot/EditPanel.vue
  10. 2 2
      packages/qjkankan-editor/src/views/material/audio/index.vue
  11. 3 3
      packages/qjkankan-editor/src/views/material/image/index.vue
  12. 3 3
      packages/qjkankan-editor/src/views/material/pano/index.vue
  13. 2 2
      packages/qjkankan-editor/src/views/material/video/index.vue
  14. 1 1
      packages/qjkankan-kankan-view/.env
  15. 1 1
      packages/qjkankan-kankan-view/.env.development
  16. 8 2
      packages/qjkankan-kankan-view/.env.prod
  17. 1 1
      packages/qjkankan-kankan-view/src/components/shared/Guide.vue
  18. BIN
      packages/qjkankan-view/src/assets/images/icon/3d_normal@2x.png
  19. BIN
      packages/qjkankan-view/src/assets/images/icon/3d_selected@2x.png
  20. BIN
      packages/qjkankan-view/src/assets/images/icon/commentary@2x.png
  21. BIN
      packages/qjkankan-view/src/assets/images/icon/commentary_disabled@2x.png
  22. BIN
      packages/qjkankan-view/src/assets/images/icon/fullscreen@2x.png
  23. BIN
      packages/qjkankan-view/src/assets/images/icon/function_off@2x.png
  24. BIN
      packages/qjkankan-view/src/assets/images/icon/function_on@2x.png
  25. BIN
      packages/qjkankan-view/src/assets/images/icon/link@2x.png
  26. BIN
      packages/qjkankan-view/src/assets/images/icon/music@2x.png
  27. BIN
      packages/qjkankan-view/src/assets/images/icon/music_disabled@2x.png
  28. BIN
      packages/qjkankan-view/src/assets/images/icon/pause01@2x.png
  29. BIN
      packages/qjkankan-view/src/assets/images/icon/plane_normal@2x.png
  30. BIN
      packages/qjkankan-view/src/assets/images/icon/plane_selected@2x.png
  31. BIN
      packages/qjkankan-view/src/assets/images/icon/playing01@2x.png
  32. BIN
      packages/qjkankan-view/src/assets/images/icon/roaming_normal@2x.png
  33. BIN
      packages/qjkankan-view/src/assets/images/icon/roaming_selected@2x.png
  34. BIN
      packages/qjkankan-view/src/assets/images/icon/rotation@2x.png
  35. BIN
      packages/qjkankan-view/src/assets/images/icon/rotation_disabled@2x.png
  36. BIN
      packages/qjkankan-view/src/assets/images/icon/share@2x.png
  37. BIN
      packages/qjkankan-view/src/assets/images/icon/telephone@2x.png
  38. BIN
      packages/qjkankan-view/src/assets/images/icon/text@2x.png
  39. BIN
      packages/qjkankan-view/src/assets/images/icon/vr@2x.png
  40. 9 7
      packages/qjkankan-view/src/components/UIGather/control.vue
  41. 8 5
      packages/qjkankan-view/src/components/UIGather/index.vue
  42. 20 20
      packages/qjkankan-view/src/components/UIGather/menu.vue
  43. 23 6
      packages/qjkankan-view/src/components/UIGather/mobile/control.fdkk.vue
  44. 17 5
      packages/qjkankan-view/src/components/UIGather/mobile/control.pano.vue
  45. 11 9
      packages/qjkankan-view/src/components/UIGather/mobile/control.right.vue
  46. 0 1
      packages/qjkankan-view/src/components/UIGather/mobile/control.vue
  47. 10 6
      packages/qjkankan-view/src/components/UIGather/mobile/index.vue
  48. 2 0
      packages/qjkankan-view/src/components/assembly/Tags/metas/metas-image.vue
  49. 12 0
      packages/qjkankan-view/src/utils/fns/DomResize.js

+ 5 - 5
packages/qjkankan-editor/src/components/materialSelectorForEditor.vue

@@ -61,7 +61,7 @@
             </span>
             <span class="table-data" v-for="(tableItemStructure, idx) in tableHeadersForImage" :key="idx">
               <div v-if="tableItemStructure.type=='image'" class="list-img">
-                <img :src="item.successInfo[tableItemStructure.key] + `?x-oss-process=image/resize,p_10&${Math.random()}`" alt="">
+                <img :src="item.successInfo[tableItemStructure.key] + `?x-oss-process=image/resize,p_20&${Math.random()}`" alt="">
               </div>
               <span  v-else class="ellipsis" v-title="tableItemStructure.key === 'name' ? item.successInfo[tableItemStructure.key] : ''">{{ item.successInfo[tableItemStructure.key] }}</span>
             </span>
@@ -113,7 +113,7 @@
           </span>
           <span class="table-data" v-for="(sub,idx) in tableHeadersForImage" :key="idx">
             <div v-if="sub.type=='image'" class="list-img">
-              <img :src="item[sub.key] + `?x-oss-process=image/resize,p_10&${Math.random()}`" alt="">
+              <img :src="item[sub.key] + `?x-oss-process=image/resize,p_20&${Math.random()}`" alt="">
             </div>
             <span class="ellipsis" v-else v-title="sub.key === 'name' ? item[sub.key] : ''">{{ item[sub.key] }}</span>
           </span>
@@ -161,7 +161,7 @@
             </span>
             <span class="table-data" v-for="(tableItemStructure, idx) in tableHeadersForPano" :key="idx">
               <div v-if="tableItemStructure.type=='image'" class="list-img">
-                <img :src="item.successInfo[tableItemStructure.key] + `?x-oss-process=image/resize,p_10&${Math.random()}`" alt="">
+                <img :src="item.successInfo[tableItemStructure.key] + `?x-oss-process=image/resize,p_20&${Math.random()}`" alt="">
               </div>
               <span  v-else class="ellipsis" v-title="tableItemStructure.key === 'name' ? item.successInfo[tableItemStructure.key] : ''">{{ item.successInfo[tableItemStructure.key] }}</span>
             </span>
@@ -214,7 +214,7 @@
           </span>
           <span class="table-data" v-for="(sub,idx) in tableHeadersForPano" :key="idx">
             <div v-if="sub.type=='image'" class="list-img">
-              <img :src="item[sub.key] + `?x-oss-process=image/resize,p_10&${Math.random()}`" alt="">
+              <img :src="item[sub.key] + `?x-oss-process=image/resize,p_20&${Math.random()}`" alt="">
             </div>
             <span class="ellipsis" v-else v-title="sub.key === 'name' ? item[sub.key] : ''">{{item[sub.key]}}</span>
           </span>
@@ -501,7 +501,7 @@
           </span>
           <span class="table-data" v-for="(sub,idx) in tableHeadersFor3D" :key="idx">
             <div v-if="sub.type=='image'" class="list-img">
-              <img :src="item[sub.key] + `?x-oss-process=image/resize,p_10&${Math.random()}`" alt="">
+              <img :src="item[sub.key] + `?x-oss-process=image/resize,p_20&${Math.random()}`" alt="">
             </div>
             <span class="ellipsis" v-else v-title="sub.key === 'name' ? item[sub.key] : ''">{{item[sub.key]}}</span>
           </span>

+ 5 - 5
packages/qjkankan-editor/src/components/materialSelectorForManageCenter.vue

@@ -87,7 +87,7 @@
             </span>
             <span class="table-data" v-for="(tableItemStructure, idx) in tableHeadersForImage" :key="idx">
               <div v-if="tableItemStructure.type=='image'" class="list-img">
-                <img :src="item.successInfo[tableItemStructure.key] + `?x-oss-process=image/resize,p_10&${Math.random()}`" alt="">
+                <img :src="item.successInfo[tableItemStructure.key] + `?x-oss-process=image/resize,p_20&${Math.random()}`" alt="">
               </div>
               <span  v-else class="ellipsis" v-title="tableItemStructure.key === 'name' ? item.successInfo[tableItemStructure.key] : ''">{{ item.successInfo[tableItemStructure.key] }}</span>
             </span>
@@ -144,7 +144,7 @@
           </span>
           <span class="table-data" v-for="(sub,idx) in tableHeadersForImage" :key="idx">
             <div v-if="sub.type=='image'" class="list-img">
-              <img :src="item[sub.key] + `?x-oss-process=image/resize,p_10&${Math.random()}`" alt="">
+              <img :src="item[sub.key] + `?x-oss-process=image/resize,p_20&${Math.random()}`" alt="">
             </div>
             <span class="ellipsis" v-else v-title="sub.key === 'name' ? item[sub.key] : ''">{{ item[sub.key] }}</span>
           </span>
@@ -193,7 +193,7 @@
             </span>
             <span class="table-data" v-for="(tableItemStructure, idx) in tableHeadersForPano" :key="idx">
               <div v-if="tableItemStructure.type=='image'" class="list-img">
-                <img :src="item.successInfo[tableItemStructure.key] + `?x-oss-process=image/resize,p_10&${Math.random()}`" alt="">
+                <img :src="item.successInfo[tableItemStructure.key] + `?x-oss-process=image/resize,p_20&${Math.random()}`" alt="">
               </div>
               <span  v-else class="ellipsis" v-title="tableItemStructure.key === 'name' ? item.successInfo[tableItemStructure.key] : ''">{{ item.successInfo[tableItemStructure.key] }}</span>
             </span>
@@ -251,7 +251,7 @@
           </span>
           <span class="table-data" v-for="(sub,idx) in tableHeadersForPano" :key="idx">
             <div v-if="sub.type=='image'" class="list-img">
-              <img :src="item[sub.key] + `?x-oss-process=image/resize,p_10&${Math.random()}`" alt="">
+              <img :src="item[sub.key] + `?x-oss-process=image/resize,p_20&${Math.random()}`" alt="">
             </div>
             <span class="ellipsis" v-else v-title="sub.key === 'name' ? item[sub.key] : ''">{{item[sub.key]}}</span>
           </span>
@@ -551,7 +551,7 @@
           </span>
           <span class="table-data" v-for="(sub,idx) in tableHeadersFor3D" :key="idx">
             <div v-if="sub.type=='image'" class="list-img">
-              <img :src="item[sub.key] + `?x-oss-process=image/resize,p_10&${Math.random()}`" alt="">
+              <img :src="item[sub.key] + `?x-oss-process=image/resize,p_20&${Math.random()}`" alt="">
             </div>
             <span class="ellipsis" v-else v-title="sub.key === 'name' ? item[sub.key] : ''">{{item[sub.key]}}</span>
           </span>

+ 2 - 2
packages/qjkankan-editor/src/components/materialSelectorFromWorkForEditor.vue

@@ -45,7 +45,7 @@
           </span>
           <span class="table-data" v-for="(sub,idx) in tableHeadersForPano" :key="idx">
             <div v-if="sub.type=='image'" class="list-img">
-              <img :src="item.icon + `?x-oss-process=image/resize,p_10&${Math.random()}`" alt="">
+              <img :src="item.icon + `?x-oss-process=image/resize,p_20&${Math.random()}`" alt="">
             </div>
             <span class="ellipsis" v-else v-title="item.sceneTitle">{{item.sceneTitle}}</span>
           </span>
@@ -89,7 +89,7 @@
           </span>
           <span class="table-data" v-for="(sub,idx) in tableHeadersFor3D" :key="idx">
             <div v-if="sub.type=='image'" class="list-img">
-              <img :src="item.icon + `?x-oss-process=image/resize,p_10&${Math.random()}`" alt="">
+              <img :src="item.icon + `?x-oss-process=image/resize,p_20&${Math.random()}`" alt="">
             </div>
             <span class="ellipsis" v-else v-title="item.sceneTitle">{{item.sceneTitle}}</span>
           </span>

+ 2 - 1
packages/qjkankan-editor/src/components/shared/uploads/UploadMultiple.vue

@@ -4,6 +4,7 @@
     multiple="multiple"
     type="file"
     name="file"
+    @click.stop
     id
     style="display: none"
     :accept="accept"
@@ -92,7 +93,7 @@ export default {
   },
   methods: {
     click() {
-      this.$el.click();
+      this.$el.click()
     },
   },
 };

+ 0 - 1
packages/qjkankan-editor/src/components/table/style.less

@@ -75,7 +75,6 @@
           -webkit-box-orient: vertical;
           -webkit-line-clamp: 2;
           overflow: hidden;
-          user-select: text;
         }
       }
     }

+ 1 - 0
packages/qjkankan-editor/src/framework/play/pano/index.vue

@@ -102,6 +102,7 @@ export default {
     isConfirmingPosi(newVal) {
       this.inter && clearInterval(this.inter)
       this.inter = null
+      console.log(newVal,'isConfirmingPosiisConfirmingPosi');
       if (newVal) {
         this.inter = setInterval(() => {
           __krfn.utils.getCurrentMousePosition(this.$getKrpano(), newVal)

+ 0 - 1
packages/qjkankan-editor/src/pages/Material.vue

@@ -30,7 +30,6 @@ body {
   margin: 0;
   line-height: normal;
   background: #F7F7F7;
-  user-select: none;
   font-family: OpenSans, sans-serif;
 }
 ul {

+ 3 - 0
packages/qjkankan-editor/src/views/base/Toolbar.vue

@@ -179,8 +179,11 @@ export default {
     .preview {
       overflow: hidden;
       position: relative;
+      border: 1px solid #404040;
       img {
         height: 100%;
+        width: 100%;
+        object-fit: contain;
       }
       .setting-cover-btn {
         position: absolute;

+ 3 - 1
packages/qjkankan-editor/src/views/hotspot/EditPanel.vue

@@ -388,7 +388,9 @@ export default {
     },
     addhotspot(data) {
 
-      if (this.isAdd) {
+      console.log(this.isAdd,'this.isAdd');
+
+      if (this.isAdd && this.editTitle != '编辑') {
         this.isAdd = false
         this.hotspot.img = data.img
         this.hotspot.icontype = data.id

+ 2 - 2
packages/qjkankan-editor/src/views/material/audio/index.vue

@@ -184,9 +184,9 @@ export default {
       checkUserSize({},(data)=>{
         //判断已用是否大于3G
         if ((data.data / 1024 / 1024) > 3) {
-          this.$refs.uploadFile.click()
-        }else{
           this.$alert({ content: "空间已满" });
+        }else{
+          this.$refs.uploadFile.click()
         }
       })
     },

+ 3 - 3
packages/qjkankan-editor/src/views/material/image/index.vue

@@ -77,7 +77,7 @@
           <div v-else-if="sub.type == 'image'" class="img">
             <img
               :id="'img' + item.id"
-              :src="data + (Number(item.fileSize)>512 ? `?x-oss-process=image/resize,p_10&${Math.random()}` : '') "
+              :src="data + (Number(item.fileSize)>512 ? `?x-oss-process=image/resize,p_20&${Math.random()}` : '') "
               alt=""
               @click="previewImage(item)"
             />
@@ -193,9 +193,9 @@ export default {
       checkUserSize({},(data)=>{
         //判断已用是否大于3G
         if ((data.data / 1024 / 1024) > 3) {
-          this.$refs.uploadFile.click()
-        }else{
           this.$alert({ content: "空间已满" });
+        }else{
+          this.$refs.uploadFile.click()
         }
       })
     },

+ 3 - 3
packages/qjkankan-editor/src/views/material/pano/index.vue

@@ -94,7 +94,7 @@
             @click="previewImage(item)"
           >
             <img 
-            :src="data + (Number(item.fileSize)>512 ? `?x-oss-process=image/resize,p_10&${Math.random()}` : '') "
+            :src="data + (Number(item.fileSize)>512 ? `?x-oss-process=image/resize,p_20&${Math.random()}` : '') "
             alt="" />
           </div>
           <span style="cursor: pointer;" @click="previewImage(item)" v-else-if="sub.key == 'name'">{{ data || "-" }}
@@ -241,9 +241,9 @@ export default {
       checkUserSize({},(data)=>{
         //判断已用是否大于3G
         if ((data.data / 1024 / 1024) > 3) {
-          this.$refs.uploadFile.click()
-        }else{
           this.$alert({ content: "空间已满" });
+        }else{
+          this.$refs.uploadFile.click()
         }
       })
     },

+ 2 - 2
packages/qjkankan-editor/src/views/material/video/index.vue

@@ -193,9 +193,9 @@ export default {
       checkUserSize({},(data)=>{
         //判断已用是否大于3G
         if ((data.data / 1024 / 1024) > 3) {
-          this.$refs.uploadFile.click()
-        }else{
           this.$alert({ content: "空间已满" });
+        }else{
+          this.$refs.uploadFile.click()
         }
       })
     },

+ 1 - 1
packages/qjkankan-kankan-view/.env

@@ -4,7 +4,7 @@ VUE_APP_RESOURCE_URL=https://4dkk.4dage.com/
 # 静态资源地址
 VUE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
 # sdk文件地址
-VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4/sdk/4.3.0/
+VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4-test/sdk/4.3.4-alpha.2/
 
 
 # 静态资源目录

+ 1 - 1
packages/qjkankan-kankan-view/.env.development

@@ -5,7 +5,7 @@ VUE_APP_RESOURCE_URL=https://4dkk.4dage.com/
 VUE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
 # sdk文件地址
 # VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4/www/sdk/
-VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4/sdk/4.3.0/
+VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4-test/sdk/4.3.4-alpha.2/
 
 
 

+ 8 - 2
packages/qjkankan-kankan-view/.env.prod

@@ -1,8 +1,14 @@
 NODE_ENV=production
+
 # 场景资源地址
 VUE_APP_RESOURCE_URL=https://4dkk.4dage.com/
 # 静态资源地址
-VUE_APP_CDN_URL=https://4dkk.4dage.com/v4-test/www/
+VUE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
+# sdk文件地址
+# VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4/www/sdk/
+VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4-test/sdk/4.3.4-alpha.2/
+
+
 
 # 静态资源目录
 VUE_APP_STATIC_DIR=viewer
@@ -12,5 +18,5 @@ VUE_APP_STATIC_DIR=viewer
 VUE_APP_REGION_URL=
 
 # 接口请求地址
-VUE_APP_APIS_URL=https://www.4dkankan.com/
+VUE_APP_APIS_URL=https://test.4dkankan.com/
 

+ 1 - 1
packages/qjkankan-kankan-view/src/components/shared/Guide.vue

@@ -133,7 +133,7 @@ useApp().then(app => {
 }
 .user-guide-mobile {
     position: absolute;
-    top: 3.15789rem;
+    top: 1.55789rem;
     left: 50%;
     width: 7.89474rem;
     transform: translateX(-50%);

BIN
packages/qjkankan-view/src/assets/images/icon/3d_normal@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/3d_selected@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/commentary@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/commentary_disabled@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/fullscreen@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/function_off@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/function_on@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/link@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/music@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/music_disabled@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/pause01@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/plane_normal@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/plane_selected@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/playing01@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/roaming_normal@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/roaming_selected@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/rotation@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/rotation_disabled@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/share@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/telephone@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/text@2x.png


BIN
packages/qjkankan-view/src/assets/images/icon/vr@2x.png


+ 9 - 7
packages/qjkankan-view/src/components/UIGather/control.vue

@@ -3,28 +3,28 @@
 
     <!-- 自定义链接 -->
     <li @click="onLink" v-if="customLink && customLink.isShow">
-      <img :src="require(`@/assets/images/icon/link.svg`)" alt="" />
+      <img :src="require(`@/assets/images/icon/link@2x.png`)" alt="" />
     </li>
 
     <!-- 联系电话 -->
     <li @click="onTelephone" v-if="customTelephone && customTelephone.isShow">
-      <img :src="require(`@/assets/images/icon/telephone.svg`)" alt="" />
+      <img :src="require(`@/assets/images/icon/telephone@2x.png`)" alt="" />
     </li>
 
     <!-- 简介 -->
     <li @click="onIntroduce" v-if="metadata.description">
-      <img :src="require(`@/assets/images/icon/text.svg`)" alt="" />
+      <img :src="require(`@/assets/images/icon/text@2x.png`)" alt="" />
     </li>
 
     <!-- 背景音乐 -->
     <li @click="onIsBGM" v-if="metadata.backgroundMusic && metadata.backgroundMusic.id">
-      <img :src="require(`@/assets/images/icon/${showMusicPlaying ? 'music.svg' : 'music_disabled.svg'}`)" alt="" />
+      <img :src="require(`@/assets/images/icon/${showMusicPlaying ? 'music@2x.png' : 'music_disabled@2x.png'}`)" alt="" />
     </li>
 
     <!-- 解说音频 -->
     <li @click="onIsCommentary" v-if="currentScene.explanation && currentScene.explanation.audioUrl">
       <img
-        :src="require(`@/assets/images/icon/${showCommentaryPlaying ? 'commentary.svg' : 'commentary_disabled.svg'}`)"
+        :src="require(`@/assets/images/icon/${showCommentaryPlaying ? 'commentary@2x.png' : 'commentary_disabled@2x.png'}`)"
         alt="" />
     </li>
 
@@ -268,10 +268,11 @@ soundPlayer.on('pause', () => {
   right: 20px;
   bottom: 8px;
   display: flex;
+  z-index: 9;
 
   >li {
-    width: 36px;
-    height: 36px;
+    width: 26px;
+    height: 26px;
     margin: 0 10px;
     cursor: pointer;
 
@@ -279,6 +280,7 @@ soundPlayer.on('pause', () => {
       width: 100%;
       height: 100%;
     }
+
   }
 }
 </style>

+ 8 - 5
packages/qjkankan-view/src/components/UIGather/index.vue

@@ -5,9 +5,8 @@
             <Control v-if="fdkkCurrentVersion == 'v4'" />
             <Menu v-if="fdkkCurrentVersion == 'v4'" />
             <div @click="onIsShowList" v-else class="v3daolan" :class="{ active: isShowScenesList }">
-                  <img :src="require(`@/assets/images/icon/${isShowScenesList ? 'function_off.svg' : 'function_on.svg'}`)"
+                  <img :src="require(`@/assets/images/icon/${isShowScenesList ? 'function_off@2x.png' : 'function_on@2x.png'}`)"
                         alt="" />
-                  <span>场景导航</span>
             </div>
             <sceneList />
             <div class="btnmask"></div>
@@ -60,19 +59,23 @@ useApp().then((app) => {
       bottom: 20px;
       left: 50%;
       transform: translateX(-50%);
-      border-radius: 20px;
+      border-radius: 50%;
       pointer-events: auto;
+      width: 36px;
       height: 36px;
       line-height: 36px;
       color: #fff;
       display: flex;
       align-items: center;
-      padding: 0 18px 0 12px;
+      justify-content: center;
       cursor: pointer;
 
       &.active {
             background: rgba(0, 0, 0, 0.5);
-
+      }
+      >img{
+            width: 26px;
+            height: 26px;
       }
 }
 

+ 20 - 20
packages/qjkankan-view/src/components/UIGather/menu.vue

@@ -2,40 +2,41 @@
   <ul class="menu">
     <li @click="onIsShowList"
       v-if="!((metadata.catalogRoot && metadata.catalogRoot.length == 1) && scenes.length == 1 && secondaryList.length == 1)">
-      <img :src="require(`@/assets/images/icon/${isShowScenesList ? 'function_off.svg' : 'function_on.svg'}`)" alt="" />
+      <img :src="require(`@/assets/images/icon/${isShowScenesList ? 'function_off@2x.png' : 'function_on@2x.png'}`)"
+        alt="" />
     </li>
 
 
     <div class="v-link"
-    v-if="currentScene.type == '4dkk'&&fdkkmetadata&&(fdkkmetadata.controls.showPanorama||fdkkmetadata.controls.showFloorplan||fdkkmetadata.controls.showDollhouse)"
-    ></div>
+      v-if="currentScene.type == '4dkk' && fdkkmetadata && (fdkkmetadata.controls.showPanorama || fdkkmetadata.controls.showFloorplan || fdkkmetadata.controls.showDollhouse)">
+    </div>
 
     <template v-if="currentScene.type == '4dkk'">
-   
+
       <li v-if="fdkkmetadata && fdkkmetadata.controls.showPanorama" :class="{ disabled: isPlayTours || flying }"
         @click="onModeChange('panorama')">
-        <img :src="require(`@/assets/images/icon/${mode == 'panorama' ? 'roaming_selected' : 'roaming_normal'}.svg`)"
+        <img :src="require(`@/assets/images/icon/${mode == 'panorama' ? 'roaming_selected' : 'roaming_normal'}@2x.png`)"
           alt="" />
       </li>
 
       <li v-if="fdkkmetadata && fdkkmetadata.controls.showFloorplan" :class="{ disabled: isPlayTours || flying }"
         @click="onModeChange('floorplan')">
-        <img :src="require(`@/assets/images/icon/${mode == 'floorplan' ? 'plane_selected' : 'plane_normal'}.svg`)"
+        <img :src="require(`@/assets/images/icon/${mode == 'floorplan' ? 'plane_selected' : 'plane_normal'}@2x.png`)"
           alt="" />
       </li>
 
       <li v-if="fdkkmetadata && fdkkmetadata.controls.showDollhouse" :class="{ disabled: isPlayTours || flying }"
         @click="onModeChange('dollhouse')">
-        <img :src="require(`@/assets/images/icon/${mode == 'dollhouse' ? '3d_selected' : '3d_normal'}.svg`)" alt="" />
+        <img :src="require(`@/assets/images/icon/${mode == 'dollhouse' ? '3d_selected' : '3d_normal'}@2x.png`)"
+          alt="" />
       </li>
 
       <div class="v-link"
-    v-if="toursList.length > 0&&fdkkmetadata&&(fdkkmetadata.controls.showPanorama||fdkkmetadata.controls.showFloorplan||fdkkmetadata.controls.showDollhouse)"
-      
-      ></div>
+        v-if="toursList.length > 0 && fdkkmetadata && (fdkkmetadata.controls.showPanorama || fdkkmetadata.controls.showFloorplan || fdkkmetadata.controls.showDollhouse)">
+      </div>
 
       <li class="daolan" @click.stop="playTour" v-if="toursList.length > 0">
-        <img :src="require(`@/assets/images/icon/${isPlayTours ? 'pause01' : 'playing01'}.svg`)" alt="" />
+        <img :src="require(`@/assets/images/icon/${isPlayTours ? 'pause01' : 'playing01'}@2x.png`)" alt="" />
         <span>导览</span>
         <img @click.stop="openTours" :class="{ active: showTours }" class="jiantou"
           :src="require(`@/assets/images/icon/expand_arrows@2x.png`)" alt="" />
@@ -115,21 +116,20 @@ onMounted(() => {
   z-index: 9;
 
   >li {
-    width: 36px;
-    height: 36px;
     margin: 0 10px;
     cursor: pointer;
-
+    display: flex;
+    justify-content: center;
+    align-items: center;
     >img {
-      width: 100%;
-      height: 100%;
+      width: 26px;
+      height: 26px;
     }
   }
 
-  .v-link{
+  .v-link {
     width: 1px;
     height: 26px;
-    margin-top: 5px;
     background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #FFFFFF 49%, rgba(255, 255, 255, 0) 100%);
   }
 
@@ -139,8 +139,8 @@ onMounted(() => {
     align-items: center;
 
     >img {
-      width: 36px;
-      height: 36px;
+      width: 26px;
+      height: 26px;
     }
 
     .jiantou {

+ 23 - 6
packages/qjkankan-view/src/components/UIGather/mobile/control.fdkk.vue

@@ -193,14 +193,15 @@ musicPlayer.on('pause', () => (showMusicPlaying.value = false))
 .control-fdkk {
   display: flex;
   align-items: center;
+  height: 100%;
 
   &::-webkit-scrollbar {
     display: none;
   }
 
   >li {
-    width: 36px;
-    height: 36px;
+    width: 26px;
+    height: 26px;
     margin: 0 2px;
     cursor: pointer;
     white-space: nowrap;
@@ -211,6 +212,21 @@ musicPlayer.on('pause', () => (showMusicPlaying.value = false))
       width: 100%;
       height: 100%;
     }
+
+     
+    &:last-of-type{
+      margin-right: 10px;
+      &::after{
+        width: 10px;
+        height: 1px;
+        background: none;
+        content: '';
+        display: inline-block;
+      }
+    }
+    &:first-of-type{
+      margin-left: 10px;
+    }
   }
 
   .daolan {
@@ -219,12 +235,12 @@ musicPlayer.on('pause', () => (showMusicPlaying.value = false))
     align-items: center;
 
     >img {
-      width: 36px;
-      height: 36px;
+      width: 26px;
+      height: 26px;
     }
 
     .jiantou {
-      margin-left: -4px;
+      margin-left: -2px;
       transform: rotate(180deg);
       transition: .3s ease transform;
 
@@ -234,7 +250,8 @@ musicPlayer.on('pause', () => (showMusicPlaying.value = false))
     }
 
     >span {
-      margin-left: -4px;
+      font-size: 12px;
+      margin-top: 2px;
     }
 
 

+ 17 - 5
packages/qjkankan-view/src/components/UIGather/mobile/control.pano.vue

@@ -168,15 +168,27 @@ soundPlayer.on('pause', () => (showCommentaryPlaying.value = false))
 <style lang="scss" scoped>
 .control-pano {
   display: flex;
+  align-items: center;
+  height: 100%;
   >li {
-    width: 36px;
-    height: 36px;
+    width: 32px;
+    height: 32px;
     margin: 0 2px;
     cursor: pointer;
-
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-shrink: 0;
     img {
-      width: 100%;
-      height: 100%;
+      width: 26px;
+      height: 26px;
+    }
+    
+    &:last-of-type{
+      margin-right: 10px;
+    }
+    &:first-of-type{
+      margin-left: 10px;
     }
   }
 }

+ 11 - 9
packages/qjkankan-view/src/components/UIGather/mobile/control.right.vue

@@ -121,11 +121,9 @@ const onShare = () => {
 
 watch(currentScene, () => {
   store.commit("functions/setVrStatus", false);
-  if (currentScene.value.type == 'pano') {
-    useApp().then((app) => {
-      app.krpanoDom.call('webvr.exitVR()')
-    });
-  }
+  useApp().then((app) => {
+    app.krpanoDom.call('webvr.exitVR()')
+  });
 })
 
 </script>>
@@ -149,14 +147,14 @@ watch(currentScene, () => {
     position: relative;
 
     .more {
-      font-size: 34px;
+      font-size: 30px;
     }
 
 
     &.show {
       backdrop-filter: blur(0);
       background: rgba(0, 0, 0, 0);
-
+      border-bottom-color: transparent;
       >ul {
         padding: 6px 0 30px;
         height: 114px;
@@ -176,13 +174,17 @@ watch(currentScene, () => {
     border-radius: 18px;
     backdrop-filter: blur(6px);
     border: 1px solid rgba(255, 255, 255, 0.2);
-    padding-bottom: 38px;
+    padding: 6px 0 38px;
 
     >li {
       width: 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin: 4px  0;
 
       >img {
-        width: 100%;
+        width: 26px;
       }
     }
   }

+ 0 - 1
packages/qjkankan-view/src/components/UIGather/mobile/control.vue

@@ -2,7 +2,6 @@
   <div class="controlcon">
     <Pano v-if="currentScene.type == 'pano'" />
     <Fdkk v-else />
-
   </div>
 </template>
 

+ 10 - 6
packages/qjkankan-view/src/components/UIGather/mobile/index.vue

@@ -91,14 +91,18 @@ useApp().then((app) => {
             >div {
                   width: 100%;
                   height: 36px;
+                  background: rgba(0, 0, 0, 0.4);
+                  border-radius: 50%;
+                  border: 1px solid rgba(255, 255, 255, 0.2);
+                  backdrop-filter: blur(6px);
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
 
                   >img {
-                        width: 100%;
-                        height: 100%;
-                        background: rgba(0, 0, 0, 0.4);
-                        border-radius: 50%;
-                        border: 1px solid rgba(255, 255, 255, 0.2);
-                        backdrop-filter: blur(6px);
+                        width: 24px;
+                        height: 24px;
+
                   }
             }
       }

+ 2 - 0
packages/qjkankan-view/src/components/assembly/Tags/metas/metas-image.vue

@@ -300,6 +300,8 @@ const onClickCancelFullScreen = () => {
     left: 0;
     right: 0;
     pointer-events: none;
+    opacity: 0.5;
+    z-index: 1;
     height: 60px;
     background: linear-gradient(180deg, rgba(0,0,0,0) 0%, rgba(0,0,0,0.7) 52%, #000000 100%);
   }

+ 12 - 0
packages/qjkankan-view/src/utils/fns/DomResize.js

@@ -0,0 +1,12 @@
+const DomResize = {
+    beforeMount(el, binding) {
+        
+    },
+    updated(el, binding) {
+    
+    },
+    unmounted() {
+    },
+}
+
+export default DomResize