merge 3.4

src/Column/Column.service.ts

@@ -122,6 +122,7 @@ export interface IColumnDetail {
 }
 
 export interface IMessageDetail {
+  IsLikeCount: boolean
   LikeCount: number
   CreateTime: string
   RealName: string //用户实际名称
@@ -138,10 +139,19 @@ export interface IMessageDetail {
 }
 
 export interface IMsgChildrenList {
-  Headimgurl: string | undefined
   CreateTime: string //创建时间
   MessageId: number
+  IsLikeCount: boolean
+  LikeCount: number
+  RealName: string //用户实际名称
+  Headimgurl: string //用户头像
   Content: string //留言内容
+  SourceTitle: string //专栏标题
+  CheckIds: number[]
+  YanxuanSpecialId: number
+  Status: number //消息状态，0未公开、1：已公开
+  TopTime: number //置顶时间（大于零置顶，等于零未置顶）
+  HaveOtherTop: boolean //是否有其它的置顶
 }
 export interface IActivityDetialBase {
   IsNeedBusinessCard: boolean // 是否需要上传名片
@@ -382,5 +392,11 @@ export const ColumnService = {
       url: `/yanxuan_special/message/like`,
       method: 'post',
       data: { MessageId, DoType }
+    }),
+  postColumnLike: (YanxuanSpecialId: number, DoType: number): INewResponse =>
+    NewAxiosInstanceFunc({
+      url: `/yanxuan_special/like`,
+      method: 'post',
+      data: { YanxuanSpecialId, DoType }
     })
 }

src/Column/ColumnDetail.tsx

@@ -72,7 +72,12 @@ const ColumnDetail: React.FC<IColumnDetailProps> = props => {
     if (login2p.userInfo?.UserId === data.UserId || data.IsApprovalAdmin || data.Status === 3) {
       return (
         <div className={`${styles['columndetail-page']}`}>
-          <ColumnContent detail={data as IColumnDetail} onCollect={handleToRefresh} handleToRefresh={handleToRefresh} />
+          <ColumnContent
+            detail={data as IColumnDetail}
+            onCollect={handleToRefresh}
+            onLike={handleToRefresh}
+            handleToRefresh={handleToRefresh}
+          />
         </div>
       )
     }

src/Column/ColumnIndex.tsx

@@ -278,7 +278,6 @@ const ColumnIndex: React.FC<IColumnIndexProps> = props => {
   }
   // 获赞和收藏弹框的关闭事件
   const CollectionFansClose = (type: string) => {
-    console.log(type)
     type === 'Fans' ? setFansModalShow(false) : setCollectionsShow(false)
   }
 
@@ -387,7 +386,11 @@ const ColumnIndex: React.FC<IColumnIndexProps> = props => {
                     <div className="columnindex-count-title">文章</div>
                   </div>
                   <div
-                    className="columnindex-count-item"
+                    className={`columnindex-count-item ${
+                      props.columnId && columnInfo?.UserId === login2p.userInfo?.UserId && columnInfo?.Status === 1
+                        ? 'columnindex-count-item-my-edit'
+                        : ''
+                    }`}
                     onClick={() => {
                       showCollectionsFansModal('收藏')
                     }}
@@ -396,7 +399,11 @@ const ColumnIndex: React.FC<IColumnIndexProps> = props => {
                     <div className="columnindex-count-title">获赞与收藏</div>
                   </div>
                   <div
-                    className="columnindex-count-item"
+                    className={`columnindex-count-item ${
+                      props.columnId && columnInfo?.UserId === login2p.userInfo?.UserId && columnInfo?.Status === 1
+                        ? 'columnindex-count-item-my-edit'
+                        : ''
+                    }`}
                     onClick={() => {
                       showCollectionsFansModal('粉丝')
                     }}

src/Column/components/ColumnContent.tsx

@@ -58,7 +58,7 @@ const ColumnContent: React.FC<IColumnContentProps> = props => {
     }
   })
   // 点赞/取消点赞（研选专栏）
-  const { run: postMessageLike } = useRequest(ColumnService.postMessageLike, {
+  const { run: postColumnLike } = useRequest(ColumnService.postColumnLike, {
     manual: true,
     onSuccess: res => {
       message.info(res.data.Msg || res.data.ErrMsg)
@@ -127,7 +127,7 @@ const ColumnContent: React.FC<IColumnContentProps> = props => {
       message.error('请先登录')
       return
     }
-    postMessageLike(detail.Id, !!like ? 0 : 1)
+    postColumnLike(detail.Id, !!like ? 0 : 1)
   }
   // 查看全文
   const handleToDetail = () => {
@@ -252,7 +252,7 @@ const ColumnContent: React.FC<IColumnContentProps> = props => {
       </div>
       <div className="com-fz18 com-fw-bold m-b-sm">{detail.Title}</div>
       <Watermark
-        content={login2p.userInfo ? login2p.userInfo?.UserName : '水印'}
+        content={login2p.userInfo ? login2p.userInfo?.Mobile : '水印'}
         font={{ fontSize: 22, color: 'rgba(0,0,0,.08)' }}
       >
         <div
@@ -278,31 +278,47 @@ const ColumnContent: React.FC<IColumnContentProps> = props => {
             onRefresh={handleToRefresh}
           />
         )}
-      {type === 'list' && (
-        <div className="g-flex g-flex-v-center g-flex-between m-b-md note-showmore-line">
-          <div className="g-flex g-flex-v-center">
-            <div className="note-pv">
-              <EyeOutlined size={14} className="pv-icon" />
-              <span>{(detail as IColumnDetail).Pv || 0}</span>
+      <>
+        {type === 'list' && (
+          <div className="g-flex g-flex-v-center g-flex-between m-b-md note-showmore-line">
+            <div className="g-flex g-flex-v-center">
+              <div className="note-pv">
+                <EyeOutlined size={14} className="pv-icon" />
+                <span>{(detail as IColumnDetail).Pv || 0}</span>
+              </div>
+              {(detail as IColumnDetail)?.IsCollect ? (
+                <StarFilled
+                  className="collect-icon"
+                  onClick={handleOnCollect.bind(this, (detail as IColumnDetail)?.IsCollect)}
+                />
+              ) : (
+                <StarOutlined
+                  className="collect-icon"
+                  onClick={handleOnCollect.bind(this, (detail as IColumnDetail)?.IsCollect)}
+                />
+              )}
+              <span style={{ marginRight: 10 }} className="collect-count">
+                {(detail as IColumnDetail)?.CollectNum}
+              </span>
+              {(detail as IColumnDetail)?.IsLikeCount ? (
+                <LikeFilled
+                  className="collect-icon"
+                  onClick={handleOnLike.bind(this, (detail as IColumnDetail)?.IsLikeCount)}
+                />
+              ) : (
+                <LikeOutlined
+                  className="collect-icon"
+                  onClick={handleOnLike.bind(this, (detail as IColumnDetail)?.IsLikeCount)}
+                />
+              )}
+              <span className="collect-count">{(detail as IColumnDetail)?.LikeCount}</span>
+            </div>
+            <div className="note-showmore-btn" onClick={handleToDetail}>
+              查看全文
             </div>
-            {(detail as IColumnDetail)?.IsCollect ? (
-              <StarFilled
-                className="collect-icon"
-                onClick={handleOnCollect.bind(this, (detail as IColumnDetail)?.IsCollect)}
-              />
-            ) : (
-              <StarOutlined
-                className="collect-icon"
-                onClick={handleOnCollect.bind(this, (detail as IColumnDetail)?.IsCollect)}
-              />
-            )}
-            <span className="collect-count">{(detail as IColumnDetail)?.CollectNum}</span>
-          </div>
-          <div className="note-showmore-btn" onClick={handleToDetail}>
-            查看全文
           </div>
-        </div>
-      )}
+        )}
+      </>
       {(detail as IColumnDetail)?.HasPermission === INewPermissionType.OK && (
         <>
           {!login2p.jwt && type === 'detail' ? (

src/Column/components/ColumnContentMessage.tsx

@@ -1,9 +1,9 @@
 import React, { useEffect, useState } from 'react'
 import useRequest from '@ahooksjs/use-request/es'
 import { Input, message, Modal } from 'antd'
-import { ColumnService, IMessageDetail } from 'Column/Column.service'
+import { ColumnService, IMessageDetail, IMsgChildrenList } from 'Column/Column.service'
 
-import { LikeOutlined, DeleteOutlined } from '@ant-design/icons'
+import { LikeOutlined, DeleteOutlined, LikeFilled } from '@ant-design/icons'
 import styles from '../css/ColumnMessage.module.scss'
 interface IColumnCenterProps {
   detailId: number
@@ -30,6 +30,8 @@ const ColumnContentMessage: React.FC<IColumnCenterProps> = props => {
     onSuccess: res => {
       res.data.Success ? message.success(res.data.Msg) : message.error(res.data.Msg || res.data.ErrMsg)
       setInputShow(false)
+      setMessageContent('')
+      getColumnSpecialList(pageSize, currentIndex, detailId)
     }
   })
 
@@ -41,7 +43,7 @@ const ColumnContentMessage: React.FC<IColumnCenterProps> = props => {
       setMassageList(res.List)
     }
   })
-  // deleceMessageHandler
+  // 删除留言的按钮
   const deleceMessageHandler = (item: IMessageDetail) => {
     Modal.confirm({
       title: '提醒',
@@ -64,6 +66,21 @@ const ColumnContentMessage: React.FC<IColumnCenterProps> = props => {
       getColumnSpecialList(pageSize, currentIndex, detailId)
     }
   })
+
+  // 留言的点赞
+  const likeMessageHandler = (item: IMessageDetail | IMsgChildrenList) => {
+    postMessageLike(item.MessageId, item.IsLikeCount ? 0 : 1)
+  }
+
+  //  点赞留言的接口
+  const { run: postMessageLike } = useRequest(ColumnService.postMessageLike, {
+    manual: true,
+    onSuccess: res => {
+      res.data.Success ? message.success(res.data.Msg) : message.error(res.data.Msg || res.data.ErrMsg)
+      getColumnSpecialList(pageSize, currentIndex, detailId)
+    }
+  })
+
   useEffect(() => {
     if (detailId) {
       getColumnSpecialList(pageSize, currentIndex, detailId)
@@ -104,7 +121,10 @@ const ColumnContentMessage: React.FC<IColumnCenterProps> = props => {
       )}
       {massageList.length > 0 &&
         massageList.map(item => (
-          <div key={item.MessageId} className={styles['columndetail-message-list']}>
+          <div
+            key={item.MessageId}
+            className={`${styles[`columndetail-message-list`]} ${styles[item.Status === 0 ? 'no-disclosure' : '']}`}
+          >
             <div className={styles['item-img-btn']}>
               <div>
                 <img src={item.Headimgurl} />
@@ -112,11 +132,20 @@ const ColumnContentMessage: React.FC<IColumnCenterProps> = props => {
               </div>
               <div>
                 {item.Status === 0 ? (
-                  <DeleteOutlined className={styles['delete-icon']} onClick={() => deleceMessageHandler(item)} />
+                  <div className={styles['delete-box']}>
+                    <p>未公开之前仅自己可见</p>
+                    <DeleteOutlined className={styles['delete-icon']} onClick={() => deleceMessageHandler(item)} />
+                  </div>
                 ) : (
                   <>
-                    <LikeOutlined className={styles['collect-icon']} />
-                    <span>{item.LikeCount}</span>
+                    <div>
+                      {item.IsLikeCount ? (
+                        <LikeFilled className={styles['collect-icon']} onClick={() => likeMessageHandler(item)} />
+                      ) : (
+                        <LikeOutlined className={styles['collect-icon']} onClick={() => likeMessageHandler(item)} />
+                      )}
+                      <span>{item.LikeCount}</span>
+                    </div>
                   </>
                 )}
               </div>
@@ -125,11 +154,21 @@ const ColumnContentMessage: React.FC<IColumnCenterProps> = props => {
             {item.ChildList.length > 0 &&
               item.ChildList.map(child => (
                 <div key={child.MessageId} className={styles['columndetail-messge-child-list']}>
-                  <div className={styles['item-img-btn']}>
+                  <div className={styles['child-item-img-btn']}>
                     <div>
                       <img src={child.Headimgurl} />
                       <span>{child.CreateTime}</span>
                     </div>
+                    <>
+                      <div>
+                        {child.IsLikeCount ? (
+                          <LikeFilled className={styles['collect-icon']} onClick={() => likeMessageHandler(child)} />
+                        ) : (
+                          <LikeOutlined className={styles['collect-icon']} onClick={() => likeMessageHandler(child)} />
+                        )}
+                        <span>{child.LikeCount}</span>
+                      </div>
+                    </>
                   </div>
                   <div className={styles['columndetail-messge-content']}>{child.Content}</div>
                 </div>

src/Column/components/ColumnFansModal.tsx

@@ -32,12 +32,8 @@ const ColumnFansModal: React.FC<IColumnCenterProps> = props => {
     manual: true,
     formatResult: response => response.data.Data,
     onSuccess: res => {
-      console.log(res)
-
       setListData([...listData, ...(res.List || [])])
 
-      console.log(listData, '-----')
-
       setHasMore(res ? !res.Paging.IsEnd : false)
     }
   })

src/Column/components/ColumnMessage.tsx

@@ -27,7 +27,6 @@ const ColumnMessage: React.FC<IColumnCenterProps> = props => {
   const [tabsAct, setTabsAct] = useState<number>(1) // 选择Id
   const [form] = Form.useForm()
   useEffect(() => {
-    console.log(11)
     if (open) {
       getColumnManageList(pageSize, currentIndex, tabsAct)
     }
@@ -38,8 +37,6 @@ const ColumnMessage: React.FC<IColumnCenterProps> = props => {
     manual: true,
     formatResult: response => response.data.Data,
     onSuccess: res => {
-      console.log(res)
-
       setMessageList(res.List)
     }
   })
@@ -78,7 +75,6 @@ const ColumnMessage: React.FC<IColumnCenterProps> = props => {
 
   // 留言的确定事件
   const handleFinish = (value: { Content: string }) => {
-    console.log(value)
     applyCheckColumnNote(replyItemID, value.Content, replyParentId)
   }
   // 留言的取消事件
@@ -148,7 +144,7 @@ const ColumnMessage: React.FC<IColumnCenterProps> = props => {
           </div>
           {messageList.length > 0 &&
             messageList.map(item => (
-              <div key={item.MessageId}>
+              <div key={item.MessageId} className="columncenter-content-messgae">
                 <Checkbox.Group
                   style={{ display: 'block' }}
                   value={item.CheckIds}
@@ -171,28 +167,30 @@ const ColumnMessage: React.FC<IColumnCenterProps> = props => {
                       回复
                     </span>
                   </div>
-                  <div className="columncenter-content-child">
-                    {item.ChildList.length > 0 &&
-                      item.ChildList.map(child => (
-                        <div key={child.MessageId} style={{ marginLeft: 20 }}>
-                          <Checkbox disabled={item.CheckIds.includes(item.MessageId)} value={child.MessageId}>
-                            {child.Content}
-                          </Checkbox>
-                          <div className="child-img-time">
-                            <div className="columncenter-content-img-time">
-                              <img src={child.Headimgurl} alt="" />
-                              <span> {child.CreateTime}</span>
+                  {item.ChildList.length > 0 && (
+                    <div className="columncenter-content-child">
+                      {item.ChildList.length > 0 &&
+                        item.ChildList.map(child => (
+                          <div key={child.MessageId} style={{ marginLeft: 20 }}>
+                            <Checkbox disabled={item.CheckIds.includes(item.MessageId)} value={child.MessageId}>
+                              {child.Content}
+                            </Checkbox>
+                            <div className="child-img-time">
+                              <div className="columncenter-content-img-time">
+                                <img src={child.Headimgurl} alt="" />
+                                <span> {child.CreateTime}</span>
+                              </div>
+                              <span
+                                className="columncenter-content-btn detele-btn"
+                                onClick={() => deleteHandle(child.MessageId)}
+                              >
+                                删除
+                              </span>
                             </div>
-                            <span
-                              className="columncenter-content-btn detele-btn"
-                              onClick={() => deleteHandle(child.MessageId)}
-                            >
-                              删除
-                            </span>
                           </div>
-                        </div>
-                      ))}
-                  </div>
+                        ))}
+                    </div>
+                  )}
                 </Checkbox.Group>
               </div>
             ))}
@@ -208,7 +206,7 @@ const ColumnMessage: React.FC<IColumnCenterProps> = props => {
           {messageList &&
             messageList.length > 0 &&
             messageList.map(item => (
-              <div key={item.MessageId} style={{ marginBottom: 30 }}>
+              <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>

src/Column/components/LikesCollections.tsx

@@ -12,7 +12,6 @@ interface IColumnCenterProps {
 /**研选专栏 */
 const LikesCollections: React.FC<IColumnCenterProps> = props => {
   const { open, columnInfoFrom, onClose } = props
-  console.log(columnInfoFrom)
 
   const handleOnClose = () => {
     props.onClose('Collection')

src/Column/css/ColumnIndex.module.scss

@@ -133,13 +133,9 @@
           .columnindex-count-item {
             margin-right: 40px;
             text-align: center;
-            cursor: pointer;
             &:last-child {
               margin-right: 0;
             }
-            &:first-child {
-              cursor: default;
-            }
             .columnindex-count {
               font-size: 36px;
               font-weight: bold;
@@ -150,6 +146,11 @@
               line-height: 22px;
             }
           }
+          .columnindex-count-item-my-edit{
+            cursor: pointer;
+            border: 1px solid #FFECBF;
+            padding:0px 10px;
+          }
         }
         .columnindex-label-line {
           .columnindex-label {
@@ -321,7 +322,7 @@
         margin: 20px 0;
         color: #999;
         .btn-disabled {
-          background: #e5efff;
+          background:#FFDDB0;
           // color: #faa12f;
         }
         :last-child {
@@ -383,6 +384,10 @@
         color: #faa12f;
       }
     }
+    .columncenter-content-messgae {
+      padding-top: 5px;
+      border-bottom: 1px solid #F8F8FA;
+    }
     .reject-content {
       padding: 24px 32px;
     }

src/Column/css/ColumnMessage.module.scss

@@ -25,13 +25,15 @@
   }
 }
 .columndetail-message-list {
-  margin-top: 20px;
+  padding: 5px;
   font-size: 14px;
   color: #333;
+  border-bottom: 1px solid #dcdfe6;
   .item-img-btn {
     display: flex;
     justify-content: space-between;
     align-items: center;
+    margin-top: 8px;
     img {
       width: 20px;
       height: 20px;
@@ -42,6 +44,32 @@
     :first-child {
       display: flex;
       align-items: center;
+      flex-shrink: 0;
+    }
+  }
+  .child-item-img-btn {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 8px;
+    img {
+      width: 20px;
+      height: 20px;
+      border-radius: 50%;
+      display: inline-block;
+      margin-right: 10px;
+    }
+    div:first-child {
+      display: flex;
+      align-items: center;
+      flex-shrink: 0;
+    }
+  }
+  .delete-box {
+    p {
+      padding: 0;
+      margin: 0 8px 0 0;
+      color: #666666;
     }
   }
   .collect-icon {
@@ -57,9 +85,11 @@
     color: #d54941;
   }
 }
+.no-disclosure {
+  background-color: #fff8e7;
+}
 .columndetail-messge-child-list {
   margin: 10px 0 20px 30px;
-  // display: flex;
 }
 .columndetail-messge-content {
   margin: 10px 0;

src/Material/components/Countdown.tsx

@@ -17,7 +17,6 @@ const Countdown: React.FC<ICountdownProps> = props => {
         setCountTime(countTime => countTime - 1)
       }, 1000)
     }
-    console.log(countTime)
     if (countTime === 1) {
       onTimeChange()
     }

src/Material/components/Research.container.tsx

@@ -138,7 +138,7 @@ const ResearchContainer: React.FC<ResearchContainerProps> = props => {
               </div>
               {(info.Detail.Abstract || info.Detail?.Annotation) && <Divider />}
               <Watermark
-                content={login2p.userInfo ? login2p.userInfo?.UserName : '水印'}
+                content={login2p.userInfo ? login2p.userInfo?.Mobile : '水印'}
                 font={{ fontSize: 22, color: 'rgba(0,0,0,.08)' }}
               >
                 <div

src/assets/columnmessage.svg

@@ -1,25 +1,13 @@
-<svg width="90" height="90" viewBox="0 0 90 90" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_1045_15406)">
-<rect x="8" y="7" width="68" height="68" rx="8" fill="#E7B453" shape-rendering="crispEdges"/>
+<svg width="68" height="68" viewBox="0 0 68 68" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="68" height="68" rx="8" fill="#E7B453"/>
 <g clip-path="url(#clip0_1045_15406)">
-<path d="M60.7545 54.3084C60.7545 55.355 60.3388 56.3588 59.5987 57.0988C58.8587 57.8388 57.855 58.2546 56.8084 58.2546H27.1947C26.1481 58.2546 25.1444 57.8388 24.4043 57.0988C23.6643 56.3588 23.2485 55.355 23.2485 54.3084V35.3041C23.2485 34.2575 23.6643 33.2538 24.4043 32.5137C25.1444 31.7737 26.1481 31.3579 27.1947 31.3579H56.8098C57.8564 31.3579 58.8601 31.7737 59.6002 32.5137C60.3402 33.2538 60.756 34.2575 60.756 35.3041V54.3055L60.7545 54.3084ZM25.9085 53.6215C25.9085 54.7104 26.7913 55.5946 27.8816 55.5946H56.1229C56.6462 55.5946 57.1481 55.3867 57.5181 55.0167C57.8881 54.6467 58.096 54.1448 58.096 53.6215V35.991C58.096 35.4677 57.8881 34.9658 57.5181 34.5958C57.1481 34.2258 56.6462 34.0179 56.1229 34.0179H27.8816C27.3583 34.0179 26.8565 34.2258 26.4864 34.5958C26.1164 34.9658 25.9085 35.4677 25.9085 35.991V53.6186V53.6215Z" fill="white"/>
-<path d="M29.2072 40.7746C29.2072 40.4218 29.3473 40.0835 29.5967 39.8341C29.8461 39.5847 30.1844 39.4446 30.5372 39.4446H31.4535C31.6282 39.4446 31.8012 39.479 31.9625 39.5458C32.1239 39.6126 32.2705 39.7106 32.394 39.8341C32.5175 39.9576 32.6155 40.1042 32.6823 40.2656C32.7491 40.427 32.7836 40.5999 32.7836 40.7746C32.7836 40.9492 32.7491 41.1222 32.6823 41.2835C32.6155 41.4449 32.5175 41.5915 32.394 41.715C32.2705 41.8385 32.1239 41.9365 31.9625 42.0033C31.8012 42.0702 31.6282 42.1046 31.4535 42.1046H30.5372C30.1844 42.1046 29.8461 41.9644 29.5967 41.715C29.3473 41.4656 29.2072 41.1273 29.2072 40.7746ZM36.1202 40.7746C36.1202 40.4218 36.2604 40.0835 36.5098 39.8341C36.7592 39.5847 37.0975 39.4446 37.4502 39.4446H52.3813C52.556 39.4446 52.7289 39.479 52.8903 39.5458C53.0516 39.6126 53.1983 39.7106 53.3218 39.8341C53.4453 39.9576 53.5432 40.1042 53.6101 40.2656C53.6769 40.427 53.7113 40.5999 53.7113 40.7746C53.7113 40.9492 53.6769 41.1222 53.6101 41.2835C53.5432 41.4449 53.4453 41.5915 53.3218 41.715C53.1983 41.8385 53.0516 41.9365 52.8903 42.0033C52.7289 42.0702 52.556 42.1046 52.3813 42.1046H37.4502C37.0975 42.1046 36.7592 41.9644 36.5098 41.715C36.2604 41.4656 36.1202 41.1273 36.1202 40.7746ZM28.9426 31.7189L39.8135 25.1463L41.1962 27.4336L30.3252 34.0076L28.9426 31.7203V31.7189ZM43.3461 27.3693L44.7302 25.082L55.5412 31.6195L54.1586 33.9068L43.3461 27.3693ZM29.2072 48.93C29.2072 48.5772 29.3473 48.2389 29.5967 47.9895C29.8461 47.7401 30.1844 47.6 30.5372 47.6H52.5742C52.927 47.6 53.2653 47.7401 53.5147 47.9895C53.7641 48.2389 53.9042 48.5772 53.9042 48.93C53.9042 49.2827 53.7641 49.621 53.5147 49.8704C53.2653 50.1198 52.927 50.26 52.5742 50.26H30.5372C30.3625 50.26 30.1896 50.2256 30.0282 50.1587C29.8668 50.0919 29.7202 49.9939 29.5967 49.8704C29.4732 49.7469 29.3752 49.6003 29.3084 49.4389C29.2416 49.2776 29.2072 49.1046 29.2072 48.93Z" fill="white"/>
-<path d="M42.0001 29.4625C41.4934 29.4628 40.9916 29.3633 40.5233 29.1697C40.0551 28.976 39.6296 28.692 39.2711 28.334C38.9126 27.9759 38.6281 27.5507 38.434 27.0827C38.2398 26.6146 38.1397 26.113 38.1394 25.6063C38.1391 25.0996 38.2386 24.5978 38.4323 24.1295C38.6259 23.6613 38.9099 23.2358 39.268 22.8773C39.6261 22.5188 40.0513 22.2343 40.5193 22.0402C40.9873 21.846 41.489 21.7459 41.9957 21.7456C43.019 21.745 44.0006 22.151 44.7247 22.8742C45.4487 23.5974 45.8557 24.5785 45.8563 25.6019C45.8569 26.6252 45.451 27.6068 44.7278 28.3309C44.0046 29.0549 43.0234 29.4619 42.0001 29.4625ZM42.0001 24.4056C41.8426 24.4053 41.6866 24.4361 41.541 24.4961C41.3954 24.556 41.263 24.6441 41.1515 24.7553C41.0399 24.8664 40.9513 24.9985 40.8908 25.1439C40.8303 25.2892 40.799 25.4451 40.7987 25.6026C40.7984 25.7601 40.8291 25.9161 40.8891 26.0617C40.9491 26.2073 41.0372 26.3396 41.1484 26.4512C41.2595 26.5628 41.3915 26.6513 41.5369 26.7119C41.6823 26.7724 41.8382 26.8037 41.9957 26.804C42.3135 26.8046 42.6186 26.6789 42.8438 26.4545C43.0689 26.2302 43.1957 25.9256 43.1963 25.6077C43.1969 25.2899 43.0712 24.9848 42.8469 24.7596C42.6225 24.5345 42.3179 24.4076 42.0001 24.4071V24.4056Z" fill="white"/>
-</g>
+<path d="M52.7545 47.3084C52.7545 48.355 52.3388 49.3588 51.5987 50.0988C50.8587 50.8388 49.855 51.2546 48.8084 51.2546H19.1947C18.1481 51.2546 17.1444 50.8388 16.4043 50.0988C15.6643 49.3588 15.2485 48.355 15.2485 47.3084V28.3041C15.2485 27.2575 15.6643 26.2538 16.4043 25.5137C17.1444 24.7737 18.1481 24.3579 19.1947 24.3579H48.8098C49.8564 24.3579 50.8601 24.7737 51.6002 25.5137C52.3402 26.2538 52.756 27.2575 52.756 28.3041V47.3055L52.7545 47.3084ZM17.9085 46.6215C17.9085 47.7104 18.7913 48.5946 19.8816 48.5946H48.1229C48.6462 48.5946 49.1481 48.3867 49.5181 48.0167C49.8881 47.6467 50.096 47.1448 50.096 46.6215V28.991C50.096 28.4677 49.8881 27.9658 49.5181 27.5958C49.1481 27.2258 48.6462 27.0179 48.1229 27.0179H19.8816C19.3583 27.0179 18.8565 27.2258 18.4864 27.5958C18.1164 27.9658 17.9085 28.4677 17.9085 28.991V46.6186V46.6215Z" fill="white"/>
+<path d="M21.2072 33.7746C21.2072 33.4218 21.3473 33.0835 21.5967 32.8341C21.8461 32.5847 22.1844 32.4446 22.5372 32.4446H23.4535C23.6282 32.4446 23.8012 32.479 23.9625 32.5458C24.1239 32.6126 24.2705 32.7106 24.394 32.8341C24.5175 32.9576 24.6155 33.1042 24.6823 33.2656C24.7491 33.427 24.7836 33.5999 24.7836 33.7746C24.7836 33.9492 24.7491 34.1222 24.6823 34.2835C24.6155 34.4449 24.5175 34.5915 24.394 34.715C24.2705 34.8385 24.1239 34.9365 23.9625 35.0033C23.8012 35.0702 23.6282 35.1046 23.4535 35.1046H22.5372C22.1844 35.1046 21.8461 34.9644 21.5967 34.715C21.3473 34.4656 21.2072 34.1273 21.2072 33.7746ZM28.1202 33.7746C28.1202 33.4218 28.2604 33.0835 28.5098 32.8341C28.7592 32.5847 29.0975 32.4446 29.4502 32.4446H44.3813C44.556 32.4446 44.7289 32.479 44.8903 32.5458C45.0516 32.6126 45.1983 32.7106 45.3218 32.8341C45.4453 32.9576 45.5432 33.1042 45.6101 33.2656C45.6769 33.427 45.7113 33.5999 45.7113 33.7746C45.7113 33.9492 45.6769 34.1222 45.6101 34.2835C45.5432 34.4449 45.4453 34.5915 45.3218 34.715C45.1983 34.8385 45.0516 34.9365 44.8903 35.0033C44.7289 35.0702 44.556 35.1046 44.3813 35.1046H29.4502C29.0975 35.1046 28.7592 34.9644 28.5098 34.715C28.2604 34.4656 28.1202 34.1273 28.1202 33.7746ZM20.9426 24.7189L31.8135 18.1463L33.1962 20.4336L22.3252 27.0076L20.9426 24.7203V24.7189ZM35.3461 20.3693L36.7302 18.082L47.5412 24.6195L46.1586 26.9068L35.3461 20.3693ZM21.2072 41.93C21.2072 41.5772 21.3473 41.2389 21.5967 40.9895C21.8461 40.7401 22.1844 40.6 22.5372 40.6H44.5742C44.927 40.6 45.2653 40.7401 45.5147 40.9895C45.7641 41.2389 45.9042 41.5772 45.9042 41.93C45.9042 42.2827 45.7641 42.621 45.5147 42.8704C45.2653 43.1198 44.927 43.26 44.5742 43.26H22.5372C22.3625 43.26 22.1896 43.2256 22.0282 43.1587C21.8668 43.0919 21.7202 42.9939 21.5967 42.8704C21.4732 42.7469 21.3752 42.6003 21.3084 42.4389C21.2416 42.2776 21.2072 42.1046 21.2072 41.93Z" fill="white"/>
+<path d="M34.0001 22.4625C33.4934 22.4628 32.9916 22.3633 32.5233 22.1697C32.0551 21.976 31.6296 21.692 31.2711 21.334C30.9126 20.9759 30.6281 20.5507 30.434 20.0827C30.2398 19.6146 30.1397 19.113 30.1394 18.6063C30.1391 18.0996 30.2386 17.5978 30.4323 17.1295C30.6259 16.6613 30.9099 16.2358 31.268 15.8773C31.6261 15.5188 32.0513 15.2343 32.5193 15.0402C32.9873 14.846 33.489 14.7459 33.9957 14.7456C35.019 14.745 36.0006 15.151 36.7247 15.8742C37.4487 16.5974 37.8557 17.5785 37.8563 18.6019C37.8569 19.6252 37.451 20.6068 36.7278 21.3309C36.0046 22.0549 35.0234 22.4619 34.0001 22.4625ZM34.0001 17.4056C33.8426 17.4053 33.6866 17.4361 33.541 17.4961C33.3954 17.556 33.263 17.6441 33.1515 17.7553C33.0399 17.8664 32.9513 17.9985 32.8908 18.1439C32.8303 18.2892 32.799 18.4451 32.7987 18.6026C32.7984 18.7601 32.8291 18.9161 32.8891 19.0617C32.9491 19.2073 33.0372 19.3396 33.1484 19.4512C33.2595 19.5628 33.3915 19.6513 33.5369 19.7119C33.6823 19.7724 33.8382 19.8037 33.9957 19.804C34.3135 19.8046 34.6186 19.6789 34.8438 19.4545C35.0689 19.2302 35.1957 18.9256 35.1963 18.6077C35.1969 18.2899 35.0712 17.9848 34.8469 17.7596C34.6225 17.5345 34.3179 17.4076 34.0001 17.4071V17.4056Z" fill="white"/>
 </g>
 <defs>
-<filter id="filter0_d_1045_15406" x="0" y="0" width="90" height="90" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dx="3" dy="4"/>
-<feGaussianBlur stdDeviation="5.5"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.937255 0 0 0 0 0.807843 0 0 0 0 0.482353 0 0 0 0.42 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1045_15406"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1045_15406" result="shape"/>
-</filter>
 <clipPath id="clip0_1045_15406">
-<rect width="38" height="38" fill="white" transform="translate(23 21)"/>
+<rect width="38" height="38" fill="white" transform="translate(15 14)"/>
 </clipPath>
 </defs>
 </svg>