Merge branch 'v1.2.0' into dev

packages/qjkankan-kankan-view/src/pages/SMG.vue

@@ -84,7 +84,6 @@ const autoPlayMedia = player => {
     $player.addEventListener('touchstart', onclick)
 }
 
-
 listenMessage()
 
 const closetagtype = () => {
@@ -268,7 +267,6 @@ onMounted(() => {
       "*"
     );
     autoPlayMedia()
-
   });
   app.Scene.on("panorama.videorenderer.resumerender", () => {
     window.parent.postMessage(

packages/qjkankan-view/src/components/Fdkk/index.vue

@@ -85,7 +85,6 @@ const handleMessage = (res) => {
       if (params.music) {
         // console.log(useMusicPlayer.player,'useMusicPlayer.player');
         useMusicPlayer.player.watchPlay(true)
-        console.log(useMusicPlayer.player);
         if (isMobile.value) {
           if (useMusicPlayer.player.isPlay) {
             setTimeout(() => {
@@ -103,7 +102,6 @@ const handleMessage = (res) => {
 
     if (event == "fdkkMetadata") {
       store.commit('fdkk/setMetadata', params.metadata)
-      console.log(params.metadata, 'params.metadata');
     }
 
 
@@ -119,13 +117,12 @@ const handleMessage = (res) => {
         musicPlayer.resume()
       } else {
         musicPlayer.pause(true)
-
       }
     }
 
     if (event == "autoPlayBgm") {
       // useMusicPlayer.player.watchPlay(true)
-      if (!useMusicPlayer.player.isPlay) {
+      if (!useMusicPlayer.player.isPlay && !musicPlayer.pauseFromOther) {
         musicPlayer.pauseFromOther = true
         setTimeout(() => {
           musicPlayer.play()

packages/qjkankan-view/src/components/Pano/index.vue

@@ -20,6 +20,7 @@ const musicPlayer = useMusicPlayer()
 const soundPlayer = useSoundPlayer()
 
 const store = useStore();
+const isMobile = computed(() => browser.isMobile());
 
 const currentScene = computed(() => store.getters["scene/currentScene"]);
 const metadata = computed(() => store.getters["scene/metadata"]);
@@ -55,6 +56,13 @@ watch(currentScene, (newVal, oldVal) => {
     if (store.getters['fdkk/fdkkBGM']) {
       store.commit('fdkk/setFdkkBGM', '')
       useMusicPlayer.player.watchPlay(true)
+      if (isMobile.value) {
+          if (useMusicPlayer.player.isPlay) {
+            setTimeout(() => {
+              musicPlayer.play()
+            }, 50);
+          }
+        }
     }
 
     nextTick(() => {

packages/qjkankan-view/src/components/UIGather/mobile/list.vue

@@ -38,7 +38,7 @@
     <div class="swiper-container" id="swcatalogRoot" :style="`width:${Math.min(catalogRootW, innerW)}px;
     padding:${catalogRootW > innerW ? '0 15px' : '0'}`"
       v-if="metadata.catalogRoot.length > 0 && metadata.catalogs.length > 1">
-      <ul class="swiper-wrapper" v-if="metadata.catalogRoot.length > 1">
+      <ul class="swiper-wrapper" v-show="metadata.catalogRoot.length > 1">
         <li class="swiper-slide" :class="{
           active: currentCatalogRoot.id == item.id,
           loopspan: item.name.length > spanlength && currentCatalogRoot.id == item.id,
@@ -119,7 +119,7 @@ const loadList = () => {
         });
         if (item == '#swScenes') {
           setTimeout(() => {
-            tmp && tmp.slideTo(0, 50, false)
+            tmp && tmp.slideTo(0, 80, false)
           }, 0);
         }