From 5e47738f99e307bab1c8a5ee9ecd96d8c7f4a968 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 08 Jan 2022 10:43:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobilePopupOur/index.vue | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/components/mobilePopupOur/index.vue b/src/components/mobilePopupOur/index.vue
index 92e36be..1270934 100644
--- a/src/components/mobilePopupOur/index.vue
+++ b/src/components/mobilePopupOur/index.vue
@@ -113,7 +113,7 @@
this.getListSearchMethod(this.mBigPopup.value);
return;
}
- this.choiceMain = this.popupOurOpenData.qurey; // 进入的主题：列：机构单位，校园建筑
+ this.choiceMain = this.popupOurOpenData.qurey; // 进入的主题：列：机构单位，社区建筑
this.choiceData = this.popupOurOpenData.main; //带入数据 包括name、type、method
this.choiceValue = this.popupOurOpenData.main[0].name;
@@ -192,10 +192,10 @@
const data = res.data.data;
let outList = [];
if (
- this.mBigPopup.name == "校园建筑" ||
+ this.mBigPopup.name == "社区建筑" ||
this.mBigPopup.name == "文化风景"
) {
- // 校园建筑使用该id获取具体信息
+ // 社区建筑使用该id获取具体信息
data.forEach((item) => {
let icon = item.tpurl.split(",");
outList.push({
@@ -206,7 +206,7 @@
from: this.choiceMain,
video: item.videourl,
buts:
- this.mBigPopup.name == "校园建筑" ||
+ this.mBigPopup.name == "社区建筑" ||
this.mBigPopup.name == "文化风景"
? ["定位", "实景", "图集"]
: ["定位"],
@@ -234,7 +234,7 @@
introduce: item.introduce,
video: item.videourl,
buts:
- that.mBigPopup.name == "校园建筑" ||
+ that.mBigPopup.name == "社区建筑" ||
that.mBigPopup.name == "文化风景"
? ["定位", "实景", "图集"]
: ["定位"],
@@ -249,6 +249,7 @@
}
that.tabTable[+campus - 1].child = outList;
});
+ this.notLine();
},
//搜索请求
getListSearchMethod(name) {
@@ -283,7 +284,7 @@
introduce: item.list.introduce,
video: item.list.videourl,
buts:
- that.mBigPopup.name == "校园建筑" ||
+ that.mBigPopup.name == "社区建筑" ||
that.mBigPopup.name == "文化风景"
? ["定位", "实景", "图集"]
: ["定位"],
@@ -293,7 +294,13 @@
that.fullscreenLoading = false;
that.onlyData = outList;
});
+ this.notLine();
+ },
+ notLine() {
+ setTimeout(() => {
+ this.fullscreenLoading = false;
+ }, 5000);
},
},
};
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3