From 326952ad4052d373c484d9cfcbbec6b583438205 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 25 Mar 2022 16:22:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobileWindow/index.vue | 8 +++++++-
src/components/mobilePopupOurAfter/index.vue | 5 +++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/components/mobilePopupOurAfter/index.vue b/src/components/mobilePopupOurAfter/index.vue
index 6cb7644..0e902f0 100644
--- a/src/components/mobilePopupOurAfter/index.vue
+++ b/src/components/mobilePopupOurAfter/index.vue
@@ -194,13 +194,14 @@
],
openData6: [{ name: "停车场", type: 11, method: getListLifeOnce }],
openData5: [{ name: "出入口", type: 12, method: getListLifeOnce }],
- useHD: false,
+ useHD: true,
};
},
mounted() {
this.getActivitys();
if (this.useHD) {
- this.choiceDataDown[3] = { name: "" };
+ this.choiceDataDown.pop();
+ this.choiceDataDown.push({ name: "" });
}
},
methods: {
diff --git a/src/components/mobileWindow/index.vue b/src/components/mobileWindow/index.vue
index f807ec4..c12ca57 100644
--- a/src/components/mobileWindow/index.vue
+++ b/src/components/mobileWindow/index.vue
@@ -42,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
--
Gitblit v1.9.3