From 117dc4cec546f830bc941ea314dcbdb9b370b211 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 25 Jan 2022 14:43:11 +0800
Subject: [PATCH] 冲突
---
src/pcviews/specialmap/welcome.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/pcviews/specialmap/welcome.vue b/src/pcviews/specialmap/welcome.vue
index e10e975..23fea50 100644
--- a/src/pcviews/specialmap/welcome.vue
+++ b/src/pcviews/specialmap/welcome.vue
@@ -3,7 +3,7 @@
* @Name: 社区迎新
* @Date: 2021-11-15 17:14:47
* @Last Modified by: Morpheus
- * @Last Modified time: 2022-01-17 11:25:32
+ * @Last Modified time: 2022-01-21 16:01:43
*/
<template>
<div>
@@ -80,7 +80,7 @@
</a>
</div>
<div class="content">
- <iframe :src="panoramaUrl" frameborder="0"></iframe>
+ <iframe style="width: 100%; height: 100%" :src="panoramaUrl" frameborder="0"></iframe>
</div>
</div>
</div>
@@ -108,13 +108,13 @@
DC: null,
pathLayer: null,
pointLayer: null,
-
+ panoramaUrlOne: '',
+ panoramaUrl: '',
audioSource: '',
audioFlag: false,
audioCourse: false,
audioSynth: null,
audioMsg: null,
-
panoramaShow: false
}
},
@@ -140,6 +140,8 @@
this.time = result.time
this.sponsor = result.sponsor
this.undertake = result.undertake
+ this.panoramaUrl = result.panoramaurl
+ this.panoramaUrlOne = result.panoramaurl
this.introduce = result.context
this.audioSource = result.context
this.list = result.tpurl.split(',')
@@ -250,6 +252,7 @@
},
panoramaPlay () {
this.panoramaShow = true
+ this.panoramaUrl = this.panoramaUrlOne
}
}
--
Gitblit v1.9.3