From 9e43f80d96bda7f1108dcfcfd7340e567f2e48d0 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Dec 2021 13:57:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/styles/mobile/popup.scss | 138 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 120 insertions(+), 18 deletions(-)
diff --git a/src/styles/mobile/popup.scss b/src/styles/mobile/popup.scss
index f7eedc5..eece555 100644
--- a/src/styles/mobile/popup.scss
+++ b/src/styles/mobile/popup.scss
@@ -16,19 +16,49 @@
left: 1000px;
position: absolute;
height: auto;
- background-color: #fff;
+ // background-color: #fff;
+ background-image: linear-gradient(
+ // 135deg,
+ // #28bbf06c 50%,
+ // transparent 50%
+ #28bbf06c 35px,
+ #28bbf06c 35px,
+ #28bbf06c calc(100% - 34px),
+ transparent calc(100% - 34px)
+ ),
+ linear-gradient(
+ // -45deg,
+ // #28bbf06c 50.1%,
+ // transparent 50%
+ transparent 35px,
+ #28bbf06c 35px,
+ #28bbf06c calc(100% - 0px),
+ transparent calc(100% - 0px)
+ );
+ // background-image: linear-gradient(135deg, transparent 30px, #28bbf06c 30px, #28bbf06c 50%, transparent 50%),
+ // linear-gradient(-45deg, transparent 30px, #28bbf06c 30px, #28bbf06c 50.1%, transparent 50%);
border-radius: 10px;
position: relative;
.mobiletitle {
// width: calc(90% - 1px);
+ color: #fff;
width: 100%;
height: 35px;
- background-color: #f7f7f7;
+ // background-image: linear-gradient(135deg, transparent 25px, #29baf1 25px);
+ background-image: linear-gradient(#29baf1a1, #29baf1a1);
+
+ // background-image: linear-gradient(#29baf1, #28bbf0);
+ // background-color: #f7f7f7;
border-bottom: 1px solid #ebebeb;
- font-size: 14px;
+ font-size: 16px;
border-radius: 10px 10px 0 0;
padding: 8px 14px;
+ padding-right: 27px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ line-height: 20px;
box-sizing: border-box;
}
.mobilelabel-content {
@@ -38,14 +68,18 @@
.mobile-popup-imgs-heard {
.mobile-popup-imgs-h-close {
width: 35px;
- height: 35px;
- background-color: #f7f7f7;
+ height: 34px;
+ // background-image: linear-gradient(#29baf1a1, #29baf1a1);
+ // background-image: linear-gradient(#29baf1, #28bbf0);
+ // background-color: #f7f7f7;
+ background-color: transparent;
position: absolute;
@extend .centersFlex;
border-radius: 100px;
right: 0;
top: 0;
.icon {
+ color: #fff;
font-size: 25px;
}
}
@@ -55,50 +89,71 @@
letter-spacing: 1px;
box-sizing: border-box;
img {
+ margin-left: calc(50% - 35px);
width: 70px;
- height: 50px;
+ height: 70px;
}
//内容显示
+ $centerFontSize: 13px;
.mobileBig-center-our {
width: 100%;
height: auto;
+ font-size: $centerFontSize;
.mobileBig-center {
width: 100%;
min-height: 30px;
border-bottom: 1px solid #f7f7f7;
@extend .centersFlex;
.m-c-title {
- width: 25%;
+ color: #fff;
+ width: 21%;
}
.m-c-center {
- width: 75%;
+ width: 79%;
// text-indent: 2em;
word-wrap: break-word;
+ color: #fff;
line-height: 25px;
}
+ }
+ .mobileBig-center-introduce {
+ width: 100%;
+ height: auto;
+ // border: 1px solid red;
+ text-indent: 2em;
+ color: #fff;
}
}
}
.mobile-popup-control {
width: 100%;
height: 20px;
- background-color: #f7f7f7;
+ // background-color: #f7f7f7;
border-top: 1px solid #ebebeb;
padding: 5px 0 8px 0;
border-radius: 0 0 10px 10px;
display: flex;
align-items: center;
+ background-image: linear-gradient(#29baf1a1, #29baf1a1);
+ // background-image: linear-gradient(#29baf1, #28bbf0);
justify-content: center;
position: relative;
&::before {
content: "";
width: 0px;
height: 0px;
- border: 8px solid #ebebeb;
+ // background-image: linear-gradient(#29baf1a1, #29baf1a1);
+ border-top: 8px solid transparent;
+ border-bottom: 8px solid #19b3f0a1;
+ border-left: 8px solid transparent;
+ border-right: 8px solid #19b3f0a1;
position: absolute;
bottom: -8px;
left: calc(50% - 8px);
transform: rotate(45deg);
+ }
+ .mobilePopupOurOnce_r_d_in {
+ color: #fff;
}
}
}
@@ -131,20 +186,20 @@
div:nth-child(1) {
// border-bottom: 1px solid #ebebeb;
- margin-bottom: 37px !important;
+ margin-bottom: 49px !important;
}
div:nth-child(2) {
display: none !important;
}
- div:nth-child(3) {
- // border-top: 1px solid #ebebeb;
- }
+ // div:nth-child(3) {
+ // // border-top: 1px solid #ebebeb;
+ // }
div {
width: $controllerw;
height: $controllerw;
position: relative !important;
left: -1px !important;
- background-color: #c9302c !important;
+ background-color: rgb(33, 150, 243) !important;
color: white !important;
@extend .flexCenter;
border-radius: 5px;
@@ -184,8 +239,8 @@
@extend .flexCenter;
.el-icon-s-flag.icon {
position: relative;
- top: 10px;
- left: 10px;
+ top: 4px;
+ left: 4px;
}
}
}
@@ -293,7 +348,10 @@
.m_p_heard {
width: 100%;
height: 50px;
- background-color: #a40000;
+ background-image: linear-gradient(#29baf1, #28bbf0);
+ border-bottom: 1px solid rgba(82, 209, 255, 0.774);
+ color: #fff;
+ // background-color: #a40000;
.m_p_h_break {
position: absolute;
left: 0;
@@ -323,6 +381,24 @@
width: 100%;
height: calc(100% - 50px);
// border: 1px solid red
+ // background-image: linear-gradient(
+ // // 135deg,
+ // #28bbf0a1 30px,
+ // #28bbf0a1 30px,
+ // // #28bbf0a1 50%,
+ // // transparent 50%
+ // #28bbf0a1 100%,
+ // transparent 100%
+ // ),
+ // linear-gradient(
+ // // -45deg,
+ // transparent 30px,
+ // #28bbf0a1 30px,
+ // // #28bbf0a1 50.1%,
+ // // transparent 50%
+ // #28bbf0a1 100%,
+ // transparent 100%
+ // );
box-sizing: border-box;
.m_p_c_tableIn {
width: 100%;
@@ -331,5 +407,31 @@
overflow-x: hidden;
overflow-y: auto;
}
+ // .el-divider__text {
+ // background-image: linear-gradient(#29baf1, #28bbf0) !important;
+ // color: #fff !important;
+ // border: 0px solid transparent !important;
+ // }
+ // .el-tabs__item {
+ // color: #fff;
+ // }
+ // .el-tabs__item.is-active {
+ // color: #fff;
+ // font-size: 20px;
+ // }
+ // .el-empty {
+ // .el-empty__description p {
+ // color: #fff;
+ // }
+ // }
+ }
+}
+
+//左侧弹窗全景图片变小
+.mobile-way-entitys-box {
+ $size: 30px;
+ img {
+ width: $size;
+ height: $size;
}
}
--
Gitblit v1.9.3