From ce913ae0f5d89b5f6bd4cdd8e026a51ab2ceab8f Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Wed, 29 Jun 2022 11:21:02 +0800
Subject: [PATCH] =?UTF-8?q?6.29=20=E6=B4=BB=E5=8A=A8=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/topic/topic_bottom_button.png   | Bin 3171 -> 3074 bytes
 src/pages/PartyMemberTopic/Home/index.less |  32 +++++++++++++--------
 src/pages/PartyMemberTopic/Home/index.tsx  |  11 +++----
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/assets/topic/topic_bottom_button.png b/src/assets/topic/topic_bottom_button.png
index 0dcdcfcf742c50dda501df253f89bbdea8e25992..455995e7f5e081ca30b73f8de3e943b2331332f2 100644
GIT binary patch
delta 2405
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

delta 2503
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

diff --git a/src/pages/PartyMemberTopic/Home/index.less b/src/pages/PartyMemberTopic/Home/index.less
index 9575719..d9a7bf4 100644
--- a/src/pages/PartyMemberTopic/Home/index.less
+++ b/src/pages/PartyMemberTopic/Home/index.less
@@ -406,28 +406,22 @@
                     background-image: url("~@/assets/topic/topic_bottom_card_picture.png");
                     height: 157px;
                     width: 331px;
-                    padding: 16px;
+                    padding: 12px 16px;
                     margin-top: 18px;
 
                     .bottom-card-flex {
                         display: flex;
                         justify-content: space-between;
+                        align-items: center;
 
                         .bottom-card-title {
-                            font-size: 21px;
+                            font-size: 20px;
                             font-weight: bold;
-                            width: 189px;
-                            overflow: hidden;
-                            text-overflow: ellipsis;
-                            white-space: nowrap;
-                        }
-
-                        .bottom-card-title .bottom-card-title-type {
-                            color: #df3b37;
                         }
                     }
 
                     .bottom-card-flex img {
+                        height: 30px;
                         cursor: pointer;
                     }
 
@@ -436,10 +430,24 @@
                         filter: brightness(108%);
                     }
 
-                    .bottom-card-content {
+                    .bottom-card-remark {
+                        height: 22px;
+                    }
+
+                    .bottom-card-remark .bottom-card-remark-text {
+                        color: #df3b37;
                         font-size: 16px;
+                        width: 299px;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
+                    }
+
+                    .bottom-card-content {
+                        font-size: 15px;
                         color: #6f6f6f;
-                        margin-top: 20px;
+                        margin-top: 8px;
+                        line-height: 24px;
                     }
                 }
             }
diff --git a/src/pages/PartyMemberTopic/Home/index.tsx b/src/pages/PartyMemberTopic/Home/index.tsx
index e792301..efc0573 100644
--- a/src/pages/PartyMemberTopic/Home/index.tsx
+++ b/src/pages/PartyMemberTopic/Home/index.tsx
@@ -130,14 +130,15 @@ const BottomCardContent = (props: any) => {
             <div className='bottom-card'>
                 <div className='bottom-card-flex'>
                     <div className='bottom-card-title'>
-                        <Tooltip placement="topLeft" title={`${props.data.remark} ${props.data.contactName}`}>
-                            <span>{props.data.contactName}</span>
-                            {isNotEmpty(props.data.remark) && <span className='bottom-card-title-type'>({props.data.remark})</span>}
-                        </Tooltip>
-
+                        <span>{props.data.contactName}</span>
                     </div>
                     <img src={topic_bottom_button} onClick={() => props.onClick()} />
                 </div>
+                <div className='bottom-card-remark'>
+                    <Tooltip placement="topLeft" title={props.data.remark}>
+                        <span className='bottom-card-remark-text'>{props.data.remark}</span>
+                    </Tooltip>
+                </div>
                 <div className='bottom-card-content'>
                     <div>邮箱：{props.data.contactEmail}</div>
                     <div>电话：{props.data.contactMobiphone}</div>