From e29fb17c4fc99ab51bbe773216151a8393faf383 Mon Sep 17 00:00:00 2001
From: zhusiyu <410827992@qq.com>
Date: Tue, 9 Aug 2022 16:04:24 +0800
Subject: [PATCH] =?UTF-8?q?modal=E6=A0=B7=E5=BC=8F=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/modal/ModalPanel.vue    | 61 +++++++------------
 .../screenAdaptation/common/commonInfo.vue    |  6 +-
 .../pages/homePages/login/loginBox.vue        |  4 +-
 .../pages/homePages/menuTop/personInfo.vue    |  1 +
 4 files changed, 29 insertions(+), 43 deletions(-)

diff --git a/src/components/common/modal/ModalPanel.vue b/src/components/common/modal/ModalPanel.vue
index ba7477a..1ed6372 100644
--- a/src/components/common/modal/ModalPanel.vue
+++ b/src/components/common/modal/ModalPanel.vue
@@ -1,7 +1,7 @@
 <template>
     <a-modal :centered="true" :footer="null" :mask="mask" :title="title" :destroyOnClose="destroyOnClose"
              :closable="showCancel"
-             :visible="show_modal" :dialogClass="(className!==''?className:'')+ 'dialog-style'" :maskClosable="false"
+             :visible="show_modal" :dialogClass="(className!==''?className:'')+ ' dialog-style'" :maskClosable="false"
              :width="width !== ''?width:'30%'" @cancel.stop="optionClick($event,'cancel')" :zIndex="modalZIndex"
              :bodyStyle="{maxHeight:'calc(95vh - 33px)',overflow:'auto'}"
 
@@ -145,11 +145,6 @@
             },
             modalClassName: function (newData) {
                 this.className = newData;
-            },
-            $route(val, oldval){
-                if (val.path === '/partyCenter/party') {
-
-                }
             }
         }
     }
@@ -165,42 +160,30 @@
             border: 1px solid #31a8fa;
             box-shadow: 0 4px 12px rgba(49, 168, 250, 0.5);
             /*background: #01123E;*/
-        }
-        .party-ant-modal-content {
-            border: 1px solid #FBED05;
-            box-shadow: 0 4px 12px rgba(49, 168, 250, 0.5);
-            background: #01123E;
-        }
-        .ant-modal-header {
-            padding: 36px 24px !important;
-            /*background: #01123E;*/
-            color: #fff;
-            /*border-bottom: 1px solid #1067B0;*/
-            .ant-modal-title {
+            .ant-modal-header {
+                padding: 0 24px !important;
+                /*background: #01123E;*/
+                color: #000;
+                /*border-bottom: 1px solid #1067B0;*/
+                .ant-modal-title {
+                    line-height: 2rem !important;
+                    font-size: 1rem !important;
+                    color: #000;
+                }
+            }
+            .ant-modal-close-x {
+                height: 2rem !important;
+                width: 2rem !important;
                 line-height: 2rem !important;
-                font-size: 1.6rem !important;
-                color: #fff;
             }
-        }
-        .ant-modal-close-x {
-            height: 2rem !important;
-            width: 2rem !important;
-            line-height: 2rem !important;
-            .anticon {
-                /*color: #fff !important;*/
-                /*font-size: 2.5rem !important;*/
-                /*position: absolute !important;*/
-                /*top: 13px !important;*/
-                /*right: 20px !important;*/
+            .ok-style {
+                position: absolute;
+                font-size: 1rem;
+                color: #31a8fa;
+                top: 0.5rem;
+                right: 2rem;
+                cursor: pointer;
             }
         }
-        .ok-style {
-            position: absolute;
-            font-size: 1rem;
-            color: #31a8fa;
-            top: 0.5rem;
-            right: 2rem;
-            cursor: pointer;
-        }
     }
 </style>
diff --git a/src/views/screenAdaptation/common/commonInfo.vue b/src/views/screenAdaptation/common/commonInfo.vue
index 5b36e05..bccde61 100644
--- a/src/views/screenAdaptation/common/commonInfo.vue
+++ b/src/views/screenAdaptation/common/commonInfo.vue
@@ -163,7 +163,9 @@
                 display: flex;
                 align-items: center;
             }
-            .ant-modal-body {
+            /deep/ .ant-modal-body {
+                width: 680px !important;
+                height: 410px !important;
                 .common-info-style {
                     width: 100%;
                     height: 500px;
@@ -196,7 +198,7 @@
                         }
                     }
                     /*.content-info-style > div > div {*/
-                        /*overflow: hidden !important;*/
+                    /*overflow: hidden !important;*/
                     /*}*/
                 }
             }
diff --git a/src/views/screenAdaptation/pages/homePages/login/loginBox.vue b/src/views/screenAdaptation/pages/homePages/login/loginBox.vue
index ee6115b..6cf3eee 100644
--- a/src/views/screenAdaptation/pages/homePages/login/loginBox.vue
+++ b/src/views/screenAdaptation/pages/homePages/login/loginBox.vue
@@ -20,8 +20,8 @@
 <style scoped lang="scss">
     @import "../../../assets/scss/style";
     .login-box-style{
-        width: 600px;
-        height: 400px;
+        width: 673px;
+        height: 401px;
         box-shadow:inset 0px  0px 30px 0px rgba(32,116,247,0.3);
         border:2px solid #1379c8;
         position:relative;
diff --git a/src/views/screenAdaptation/pages/homePages/menuTop/personInfo.vue b/src/views/screenAdaptation/pages/homePages/menuTop/personInfo.vue
index 27defe8..9da0425 100644
--- a/src/views/screenAdaptation/pages/homePages/menuTop/personInfo.vue
+++ b/src/views/screenAdaptation/pages/homePages/menuTop/personInfo.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="login-perosn-info-style">
         <Portrait :personId="personId"/>
+        <!--点击头像弹出信息-->
         <!--<Portrait :personId="personId" @showMessage="showMessage"/>-->
         <span :class="{'spanColor':isPartyCenter}">{{personName}}</span>
         <div v-if="operateType === 1" class=back-style       title="退出"