From 3310d0c14c90c4fd23360113449503b0d2dde75b Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 22 Dec 2021 16:19:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobilePopupOurOnce/index.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/components/mobilePopupOurOnce/index.vue b/src/components/mobilePopupOurOnce/index.vue
index bb20d60..0191526 100644
--- a/src/components/mobilePopupOurOnce/index.vue
+++ b/src/components/mobilePopupOurOnce/index.vue
@@ -60,7 +60,7 @@
this.srcList = this.onceData.icon;
this.icon = this.srcList[0];
}
- if (this.onceData.from == "校园建筑") {
+ if (this.onceData.from == "校园建筑" || this.onceData.from == "文化风景") {
this.getOnceCampus(this.onceData.id);
} else {
this.ourData = this.onceData;
@@ -135,6 +135,7 @@
websiteUrl: result.websiteurl,
telePhone: result.telephone,
address: result.address,
+ introduce: result.introduce,
};
this.ourData = d;
});
@@ -152,8 +153,9 @@
justify-content: center !important;
}
.mobilePopupOurOnce {
- padding: 0 0;
+ padding: 8px 0 0 0;
margin: 0 8px;
+ // background-image: linear-gradient(#29baf1, #28bbf0);
.mobilePopupOurOnce_center {
// margin-bottom: 8px;
height: 80px;
@@ -165,7 +167,7 @@
height: 100%;
@extend .flexCenter;
img {
- width: 100px;
+ width: 80px;
height: 80px;
}
}
@@ -181,6 +183,7 @@
text-indent: 1em;
display: flex !important;
align-items: center !important;
+ // color: #fff;
}
.mobilePopupOurOnce_r_down {
height: 50%;
@@ -189,6 +192,7 @@
display: flex !important;
align-items: center !important;
.mobilePopupOurOnce_r_d_in {
+ // color: #fff;
font-size: 17px;
}
}
--
Gitblit v1.9.3