3.4 ok

src/Column/Column.service.ts

@@ -38,6 +38,7 @@ export interface IDocsList {
   DocIcon?: string
 }
 export interface IColumnInfo {
+  SpecialLikeCount: number
   BgImg: string
   BgImgPc: string
   CollectNum: number

src/Column/ColumnIndex.tsx

@@ -395,7 +395,9 @@ const ColumnIndex: React.FC<IColumnIndexProps> = props => {
                       showCollectionsFansModal('收藏')
                     }}
                   >
-                    <div className="columnindex-count">{columnInfo?.CollectNum || 0}</div>
+                    <div className="columnindex-count">
+                      {columnInfo?.CollectNum + columnInfo?.SpecialLikeCount || 0}
+                    </div>
                     <div className="columnindex-count-title">获赞与收藏</div>
                   </div>
                   <div

src/Column/components/ColumnContentMessage.tsx

@@ -102,7 +102,7 @@ const ColumnContentMessage: React.FC<IColumnCenterProps> = props => {
             setInputShow(true)
           }}
         >
-          留言会私信给作者，作者设置留言公开后将在文章下展示
+          请写下您的留言
         </div>
       ) : (
         <div style={{ marginTop: 20, marginBottom: 20 }}>
@@ -136,7 +136,7 @@ const ColumnContentMessage: React.FC<IColumnCenterProps> = props => {
             <div className={styles['item-img-btn']}>
               <div>
                 <img src={item.Headimgurl} />
-                <span>{item.CreateTime}</span>
+                <span style={{ color: '#999999' }}>{item.CreateTime}</span>
               </div>
               <div>
                 {item.Status === 0 ? (
@@ -165,7 +165,7 @@ const ColumnContentMessage: React.FC<IColumnCenterProps> = props => {
                   <div className={styles['child-item-img-btn']}>
                     <div>
                       <img src={child.Headimgurl} />
-                      <span>{child.CreateTime}</span>
+                      <span style={{ color: '#999999' }}>{child.CreateTime}</span>
                     </div>
                     <>
                       <div>

src/Column/components/ColumnMessage.tsx

@@ -70,12 +70,15 @@ const ColumnMessage: React.FC<IColumnCenterProps> = props => {
 
   // 设置共开的按钮点击事件
   const setupClickHandler = () => {
-    postMessagePublic(selectCheckbox, 1)
+    if (selectCheckbox.length) {
+      postMessagePublic(selectCheckbox, 1)
+    }
   }
 
   // 留言的确定事件
   const handleFinish = (value: { Content: string }) => {
     applyCheckColumnNote(replyItemID, value.Content, replyParentId)
+    handleOnModalClose()
   }
   // 留言的取消事件
   const handleOnModalClose = () => {
@@ -209,7 +212,7 @@ const ColumnMessage: React.FC<IColumnCenterProps> = props => {
               <div key={item.MessageId} style={{ marginBottom: 30 }} className="columncenter-content-messgae">
                 <div className="columncenter-content-disclosure"> {item.Content}</div>
                 <div className="columncenter-content-img-time">
-                  <span> {item.RealName}</span>
+                  <img src={item.Headimgurl} alt="" />
                   <span style={{ marginLeft: 10 }}> {item.CreateTime}</span>
                 </div>
                 <div className="columncenter-content-item-title">
@@ -225,15 +228,17 @@ const ColumnMessage: React.FC<IColumnCenterProps> = props => {
                       className="columncenter-content-btn"
                       onClick={() => cancelSelectionHandler(item)}
                     >
-                      取消精选
+                      取消公开
                     </span>
                   </div>
                 </div>
                 {item.ChildList.length > 0 &&
                   item.ChildList.map(child => (
                     <div key={child.MessageId} style={{ marginLeft: 20 }}>
-                      <div className="columncenter-content-disclosure"> {child.Content}</div>
-                      {child.CreateTime}
+                      <div className="columncenter-content-disclosure">
+                        <img src={child.Headimgurl} alt="" /> {child.Content}
+                      </div>
+                      <span>{child.CreateTime}</span>
                     </div>
                   ))}
               </div>

src/Column/components/LikesCollections.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import useRequest from '@ahooksjs/use-request/es'
+import { LikeOutlined, StarOutlined } from '@ant-design/icons'
 
 import { Modal } from 'antd'
 
@@ -18,8 +19,14 @@ const LikesCollections: React.FC<IColumnCenterProps> = props => {
   }
   return (
     <Modal title="获赞与收藏" open={open} onCancel={handleOnClose} footer={null}>
-      <div>当前获得点赞数 {columnInfoFrom?.SpecialLikeCount}</div>
-      <div>当前获得收藏数 {columnInfoFrom?.CollectNum}</div>
+      <div style={{ margin: '20px 0' }}>
+        <LikeOutlined style={{ marginRight: 10, color: '#666666' }} />
+        当前获得点赞数&nbsp;&nbsp; <span style={{ color: '#faa12f' }}>{columnInfoFrom?.SpecialLikeCount}</span>
+      </div>
+      <div>
+        <StarOutlined style={{ marginRight: 10, color: '#666666' }} />
+        当前获得收藏数&nbsp;&nbsp; <span style={{ color: '#faa12f' }}>{columnInfoFrom?.CollectNum}</span>
+      </div>
     </Modal>
   )
 }

src/Column/css/ColumnIndex.module.scss

@@ -306,8 +306,16 @@
         margin-bottom: 10px;
       }
       .columncenter-content-disclosure {
+        display: flex;
+        align-items: center;
         font-weight: 600;
         margin: 10px 0;
+        img {
+          display: block;
+          margin-right: 8px;
+          width: 20px;
+          height: 20px;
+        }
       }
       .columncenter-operate-btn {
         width: 87px;
@@ -348,9 +356,14 @@
         justify-content: space-between;
         align-items: center;
         .item-title {
+          flex: 1;
           font-size: 14px;
           color: #F1A84A;
+          padding-right: 10px;
           cursor: pointer;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
         }
       }
       .columncenter-content-child {

src/Column/css/ColumnMessage.module.scss

@@ -1,7 +1,7 @@
 .columndetail-messge-select-ipt {
   margin-top: 20px;
   width: 100%;
-  height: 97px;
+  height: 57px;
   padding: 10px 20px;
   border-radius: 3px;
   background-color: #f0f1f3;

src/Login2p/Login2pContext.tsx

@@ -153,6 +153,8 @@ const Login2pProvider: React.FC<ContextProviderProps> = ({ children }: ContextPr
         setUserInfo(data.data.Data)
         loginEnd(data.data.Data?.Authorization, next)
       }
+    } else {
+      message.error(data.data.Msg)
     }
   }
   const { run: getUserDetail, loading: getUserDetailLoading } = useRequest(() => Login2pService.getUserDetail(jwt), {