From a3761173a91a1fd7270b848f9f8d255c0bfa9b6c Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 24 Dec 2021 15:41:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobileWindow/index.vue | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/components/mobileWindow/index.vue b/src/components/mobileWindow/index.vue
index e7ae014..2b08130 100644
--- a/src/components/mobileWindow/index.vue
+++ b/src/components/mobileWindow/index.vue
@@ -10,7 +10,8 @@
<div class="mobile-popup-imgs-h-close">
<i class="el-icon-close icon" @click="closeWindow"></i>
</div>
- <img :src="url" alt="" />
+ <video :src="video" controls="controls" autoplay v-if="video"></video>
+ <img :src="url" alt="" v-show="url && !video" />
<el-image
style="width: 100px; height: 100px"
:src="url"
@@ -20,7 +21,7 @@
>
</el-image>
<!-- <div>{{ query.query }}</div> -->
- <div class="mobileBig-center-our">
+ <div class="mobileBig-center-our" v-show="!video">
<div
v-for="(item, index) in center"
:key="index"
@@ -47,6 +48,8 @@
? 'el-icon-data-board'
: item.name == '去这'
? 'el-icon-finished'
+ : item.name == '视频' || item.name == '返回'
+ ? 'el-icon-video-camera-solid'
: ''
"
class="mobilePopupOurOnce_r_d_in"
@@ -76,7 +79,7 @@
//数据更改
// this.fullscreenLoading = true;
if (!this.MobileWindowsHide) {
- // console.log("地图点击弹窗数据请求参数", this.query);
+ this.video = ""; //清除视频
let queryData = this.query.query;
// console.log(queryData);
this.title = queryData.name;
@@ -106,6 +109,14 @@
name: "去这",
},
];
+ }
+ if (queryData.video) {
+ if (queryData.from == "labels") {
+ this.seebut = [];
+ this.video = queryData.video;
+ } else {
+ this.seebut.push({ name: "视频" });
+ }
}
this.center = [];
for (let k in queryData) {
@@ -147,7 +158,8 @@
introduce: "暂无详情数据",
title: "",
fullscreenLoading: false,
- url: "/img/job/one.jpg",
+ url: "",
+ video: "",
positions: "",
srcList: [],
seebut: [],
@@ -168,6 +180,12 @@
} else if (val == "图集") {
let imgsDom = document.getElementById("mobileBigImgs");
imgsDom.click();
+ } else if (val == "视频") {
+ this.seebut[this.seebut.length - 1].name = "返回";
+ this.video = this.query.query.video;
+ } else if (val == "返回") {
+ this.seebut[this.seebut.length - 1].name = "视频";
+ this.video = "";
}
},
closeWindow() {
--
Gitblit v1.9.3