From 902a537974ce0374d68d9e717febab7157a69286 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 13 十月 2022 09:43:54 +0800
Subject: [PATCH] 冲突
---
src/views/newHome/index.vue | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/views/newHome/index.vue b/src/views/newHome/index.vue
index 70df9bf..339854e 100644
--- a/src/views/newHome/index.vue
+++ b/src/views/newHome/index.vue
@@ -327,10 +327,10 @@
};
// 去风险大屏
const toRiskPlatform = () => {
- // router.push({
- // name: "warningScreen"
- // });
- window.open('http://39.104.85.193:8585/');
+ router.push({
+ name: "warningScreen"
+ });
+ // window.open('http://39.104.85.193:8585/');
};
const throttle = (renderMenu: any, delay: number) => {
let flag = true;
@@ -431,6 +431,20 @@
100% {
position: absolute;
left: 0;
+ }
+ }
+ @keyframes upDown {
+ 50% {
+ -webkit-transform: translateY(-8px);
+ -ms-transform: translateY(-8px);
+ -o-transform: translateY(-8px);
+ transform: translateY(-8px);
+ }
+ 100% {
+ -webkit-transform: translateY(0);
+ -ms-transform: translateY(0);
+ -o-transform: translateY(0);
+ transform: translateY(0);
}
}
@media screen and (min-width: 1400px) {
@@ -895,11 +909,18 @@
overflow: hidden;
cursor: pointer;
transition: 0.3s;
- border: none;
+ border: 2px solid rgba(255,255,255,0);
&:hover {
+ border-radius: 16px;
background-image: radial-gradient(ellipse farthest-side at 50% 100%, #48a3ff 0%, #fff 120%);
box-shadow: -8px -8px 24px rgba(20, 97, 234, 0.2), 8px 8px 24px rgba(20, 97, 234, 0.2);
+ border: 2px solid #fff;
+
+ .iconImg{
+ animation: upDown 0.3s 1 ease-in-out forwards;
+ filter: drop-shadow(0 0 12px rgba(20, 97, 234, 0.4));
+ }
}
}
.cont-bg-1 {
--
Gitblit v1.9.2