From a7ea6cf45c3f4bf4456fc2d069b368a463d81425 Mon Sep 17 00:00:00 2001
From: songwc <songwc@dongwu-inc.com>
Date: Fri, 16 Sep 2022 17:34:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ballot=EF=BC=8Cdebate?=
 =?UTF-8?q?=E4=B8=AD=E5=86=85=E5=AE=B9=E5=8C=BA=E9=AB=98=E5=BA=A6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ballot/ballot.vue | 6 +++---
 src/views/debate/debate.vue | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/ballot/ballot.vue b/src/views/ballot/ballot.vue
index 5ada486..e6ea6e2 100644
--- a/src/views/ballot/ballot.vue
+++ b/src/views/ballot/ballot.vue
@@ -250,13 +250,12 @@ export default {
           .explain {
             margin-top: 30px;
             width: 416px;
-            height: 158px;
+            padding-bottom: 50px;
             background: #f2f5f7;
             border-radius: 8px;
           }
           .explaincontent {
             width: 368px;
-            height: 64px;
             font-size: 16px;
             font-family: PingFang SC;
             font-weight: 500;
@@ -333,10 +332,11 @@ export default {
         }
         .join {
           width: 1280px;
-          height: 408px;
+          min-height: 408px;
           background: #f5f6f7;
           border-radius: 8px;
           margin-top: 32px;
+          flex: 1;
         }
       }
       .detailB {
diff --git a/src/views/debate/debate.vue b/src/views/debate/debate.vue
index 015a2e4..ae5f445 100644
--- a/src/views/debate/debate.vue
+++ b/src/views/debate/debate.vue
@@ -621,7 +621,7 @@ export default {
             .discuss {
               margin-top: 8px;
               width: 435px;
-              height: 763px;
+              // height: 763px;
               background: linear-gradient(
                 0deg,
                 rgba(226, 104, 119, 0) 0%,
@@ -794,7 +794,7 @@ export default {
             .discuss {
               margin-top: 8px;
               width: 435px;
-              height: 763px;
+              // height: 763px;
               background: linear-gradient(
                 0deg,
                 rgba(88, 164, 232, 0) 0%,