tremble 2 роки тому
батько
коміт
bf5db5f465

BIN
src/assets/images/icon/music_off@2x.png


BIN
src/assets/images/icon/music_on@2x.png


+ 39 - 44
src/components/Information/View.Mobile.vue

@@ -1,12 +1,16 @@
 <template>
 <template>
     <div class="header" @touchmove.prevent>
     <div class="header" @touchmove.prevent>
-        <div class="left" :class="{ show: player.showVR }">
-            <div v-show="mode != 'panorama' && !isApp && player.showWidgets" class="back-pano" @click="onChangeMode">
+        <div class="left" :class="{ show: showMusic }">
+            <div class="music" @click.stop="onMenuClick('music')">
+                <img :src="require(`@/assets/images/icon/${showMusicPlaying?'music_on@2x':'music_off@2x'}.png`)" alt="" />
+            </div>
+
+            <!-- <div v-show="mode != 'panorama' && !isApp && player.showWidgets" class="back-pano" @click="onChangeMode">
                 <ui-icon type="show_back"></ui-icon>
                 <ui-icon type="show_back"></ui-icon>
             </div>
             </div>
             <div v-show="mode == 'panorama'" class="back" @click="onBack">
             <div v-show="mode == 'panorama'" class="back" @click="onBack">
                 <ui-icon type="_back"></ui-icon>
                 <ui-icon type="_back"></ui-icon>
-            </div>
+            </div> -->
         </div>
         </div>
         <div class="title" :class="{ up: player.showDescription, drak: mode != 'panorama', empty: !description }" @click="onShowDescription" v-show="player.showWidgets">
         <div class="title" :class="{ up: player.showDescription, drak: mode != 'panorama', empty: !description }" @click="onShowDescription" v-show="player.showWidgets">
             <div>
             <div>
@@ -191,12 +195,12 @@ const onMusicClick = () => {
     showMusicPlaying.value ? musicPlayer.pause() : musicPlayer.play()
     showMusicPlaying.value ? musicPlayer.pause() : musicPlayer.play()
 }
 }
 const onMenuClick = name => {
 const onMenuClick = name => {
-    store.commit('SetPlayerOptions', {
-        showMore: false,
-        showDescription: false,
-        showMap: true,
-        showToolbar: true,
-    })
+    // store.commit('SetPlayerOptions', {
+    //     showMore: false,
+    //     showDescription: false,
+    //     showMap: true,
+    //     showToolbar: true,
+    // })
 
 
     nextTick(() => {
     nextTick(() => {
         if (name == 'music') {
         if (name == 'music') {
@@ -206,17 +210,19 @@ const onMenuClick = name => {
             // } else {
             // } else {
             //     musicPlayer.play()
             //     musicPlayer.play()
             // }
             // }
-        } else if (name == 'share') {
-            if (isApp.value) {
-                showShare.value = true
-            } else {
-                showCopy.value = true
-            }
-        } else if (name === 'measure') {
-            this.$bus.emit('measure/Handle', 'start')
-        } else if (name == 'vr') {
-            store.commit('showVR')
-        }
+        } 
+        
+        // else if (name == 'share') {
+        //     if (isApp.value) {
+        //         showShare.value = true
+        //     } else {
+        //         showCopy.value = true
+        //     }
+        // } else if (name === 'measure') {
+        //     this.$bus.emit('measure/Handle', 'start')
+        // } else if (name == 'vr') {
+        //     store.commit('showVR')
+        // }
     })
     })
 }
 }
 const onShare = name => {
 const onShare = name => {
@@ -255,47 +261,36 @@ const onChangeMode = () => {
         top: 1rem;
         top: 1rem;
     }
     }
     .left {
     .left {
-        width: 1rem;
+        width: 1.28rem;
         height: 100%;
         height: 100%;
         display: flex;
         display: flex;
         align-items: center;
         align-items: center;
-        justify-content: center;
+        justify-content: flex-end;
+        pointer-events: none;
+
         &.show {
         &.show {
             visibility: visible;
             visibility: visible;
             pointer-events: auto;
             pointer-events: auto;
-            .back {
+            .music {
                 visibility: visible;
                 visibility: visible;
             }
             }
         }
         }
-        .back {
-            width: 0.78rem;
-            height: 0.78rem;
-            border-radius: 50%;
-            background-color: rgba(0, 0, 0, 0.3);
+       
+        .music {
+            width: 0.50rem;
+            height: 0.50rem;
             display: flex;
             display: flex;
             align-items: center;
             align-items: center;
             justify-content: center;
             justify-content: center;
             visibility: hidden;
             visibility: hidden;
             position: relative;
             position: relative;
-            i {
-                font-size: 0.3rem;
-                width: auto;
-                position: static;
-            }
-        }
-        .back-pano {
-            width: 100%;
-            height: 100%;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            // padding-left: 15px;
-            position: relative;
-            i {
-                font-size: 0.6rem;
+            >img {
+                width: 100%;
+                height: auto;
                 position: static;
                 position: static;
             }
             }
         }
         }
+       
     }
     }
     .right {
     .right {
         position: relative;
         position: relative;