From f3e4a728bca47d424fb3f9f0e2ef438cec58a2e3 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Thu, 31 Mar 2022 13:36:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobileWindow/index.vue | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/components/mobileWindow/index.vue b/src/components/mobileWindow/index.vue
index a44e4a3..c12ca57 100644
--- a/src/components/mobileWindow/index.vue
+++ b/src/components/mobileWindow/index.vue
@@ -11,8 +11,20 @@
@click="openAudio"
v-show="introduce && !video"
>
- <i class="el-icon-video-play icon" v-show="!audioState"></i>
- <i class="el-icon-video-pause icon" v-show="audioState"></i>
+ <!-- <i class="el-icon-video-play icon" v-show="!audioState"></i>
+ <i class="el-icon-video-pause icon" v-show="audioState"></i> -->
+ <img
+ src="/img/icon/start-video.png"
+ class="icon"
+ alt=""
+ v-show="!audioState"
+ />
+ <img
+ src="/img/icon/close-video.png"
+ class="icon"
+ alt=""
+ v-show="audioState"
+ />
<!-- <div id="bdtts_div_id">
<audio id="tts_autio_id" autoplay="autoplay">
<source
@@ -30,7 +42,13 @@
<div class="mobile-popup-imgs-h-close">
<i class="el-icon-close icon" @click="closeWindow"></i>
</div>
- <video :src="video" controls="controls" autoplay v-if="video"></video>
+ <!-- <video :src="video" controls="controls" autoplay v-if="video"></video> -->
+ <playVideo
+ :src="video"
+ controls="controls"
+ autoplay
+ v-if="video"
+ ></playVideo>
<!-- <img :src="url" alt="" v-show="url && !video" /> -->
<!-- style="width: 100px; height: 100px" -->
<el-image
@@ -101,7 +119,7 @@
"query",
"MobileWindowChangeData",
"audioState",
- "areaLayerSelect",
+ // "areaLayerSelect",
]),
},
watch: {
@@ -299,7 +317,7 @@
doit(res);
});
} else if (val == "实景") {
- // console.log(this.panoramaurl, query);
+ console.log(this.panoramaurl, query);
this.$store.commit("MSET_OPENMOBILEPANORAMA", this.panoramaurl);
return;
this.$store.commit(
@@ -351,9 +369,9 @@
if (!this.MobileWindowsHide) {
let that = this;
this.$store.dispatch("closeMobileWindowsDom"); //关闭随地图弹窗
- if (that.areaLayerSelect.overlay != undefined) {
- that.areaLayerSelect.overlay.setStyle({
- material: that.areaLayerSelect.color,
+ if (window.select.overlay != undefined) {
+ window.select.overlay.setStyle({
+ material: window.select.color,
outline: false,
});
@@ -375,6 +393,11 @@
margin-left: 3px;
.icon {
font-size: 20px;
+ width: 20px;
+ height: 20px;
+ float: right;
+ position: relative;
+ right: 8px;
}
}
#bdtts_div_id {
--
Gitblit v1.9.3