From e233629e0ca24390ccf4b81892511e402f5ba777 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 6 May 2022 13:58:34 +0800
Subject: [PATCH] Merge branch 'dev-0420' into dev

# Conflicts:
#	src/views/components/tinymce/index.vue
#	src/views/main-shuju/main-content.vue
---
 src/assets/scss/modules/visual/warning.scss | 8 +++++++-
 src/assets/scss/modules/warning.scss        | 4 ++--
 src/views/modules/base/resi.vue             | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/assets/scss/modules/visual/warning.scss b/src/assets/scss/modules/visual/warning.scss
index 36260a7f..265c3889 100644
--- a/src/assets/scss/modules/visual/warning.scss
+++ b/src/assets/scss/modules/visual/warning.scss
@@ -87,7 +87,7 @@
             content: "";
             width: 8px;
             height: 8px;
-            background: #f0f3f7;
+            background: #fef200;
             border-radius: 50%;
             position: absolute;
             left: 12px;
@@ -95,6 +95,12 @@
             transform: translate(0, -50%);
           }
 
+          &:nth-of-type(2) {
+            &::after {
+              background: #e70014;
+            }
+          }
+
           div:nth-child(1) {
             font-size: 16px;
             font-family: PingFang SC;
diff --git a/src/assets/scss/modules/warning.scss b/src/assets/scss/modules/warning.scss
index 2353a943..f28535b9 100644
--- a/src/assets/scss/modules/warning.scss
+++ b/src/assets/scss/modules/warning.scss
@@ -85,7 +85,7 @@
                         content: "";
                         width: 8px;
                         height: 8px;
-                        background: #f5f502;
+                        background: #fef200;
                         border-radius: 50%;
                         position: absolute;
                         left: 12px;
@@ -95,7 +95,7 @@
 
                     &:nth-of-type(2) {
                         &::after {
-                            background: #fb500d;
+                            background: #e70014;
                         }
                     }
 
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index a7375532..19e71ca5 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -410,7 +410,7 @@ export default {
   computed: {
     ...mapGetters(['clientHeight', 'iframeHeight']),
     tableHeight() {
-      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
+      const h = this.clientHeight - this.searchH - 280 + this.iframeHeight
       const _h = this.clientHeight - 280 - this.searchH
       return this.$store.state.inIframe ? h : _h
     }