Merge branch 'dev-srm' of 10.0.0.22:lingxi/lingxi-business-paltform into dev-srm

src/pages/member/components/MemberDocIncomingInfo/index.tsx

@@ -47,11 +47,16 @@ interface IProps extends Omit<CustomizeColumnProps, 'data' | 'columns'>  {
       fieldType?: string,
     }[],
   }[],
+  /**
+   * 是否展示 new
+   */
+  showNew?: boolean,
 }
 
 const MemberDocIncomingInfo: React.FC<IProps> = (props: IProps) => {
   const {
     dataSource = [],
+    showNew = false,
     ...rest
   } = props;
 
@@ -65,7 +70,7 @@ const MemberDocIncomingInfo: React.FC<IProps> = (props: IProps) => {
           <div className={styles.changed}>
             {/* {ele.fieldValue} */}
             {renderFieldTypeContent(ele.fieldType, ele.fieldValue)}
-            {ele.lastValue && ele.lastValue !== ele.fieldValue && (
+            {showNew && ele.lastValue && ele.lastValue !== ele.fieldValue && (
               <Tooltip title={`变更前：${ele.lastValue}`}>
                 <span className={styles.new}>NEW</span>
               </Tooltip>

src/pages/member/memberPrVerifyChange1/detail.tsx

@@ -174,6 +174,7 @@ const MemberPrVerifyChange1Detail: React.FC<{}> = () => {
               <MemberDocIncomingInfo
                 dataSource={memberInfo?.depositDetails}
                 id="incomingInfo"
+                showNew
               />
             </Col>
           ) : null}

src/pages/member/memberPrVerifyChange1/verify.tsx

@@ -216,6 +216,7 @@ const MemberPrVerifyChange1Verify: React.FC<{}> = () => {
               <MemberDocIncomingInfo
                 dataSource={memberInfo?.depositDetails}
                 id="incomingInfo"
+                showNew
               />
             </Col>
           ) : null}

src/pages/member/memberPrVerifyChange2/detail.tsx

@@ -174,6 +174,7 @@ const MemberPrVerifyChange2Detail: React.FC<{}> = () => {
               <MemberDocIncomingInfo
                 dataSource={memberInfo?.depositDetails}
                 id="incomingInfo"
+                showNew
               />
             </Col>
           ) : null}

src/pages/member/memberPrVerifyChange2/verify.tsx

@@ -216,6 +216,7 @@ const MemberPrVerifyChange2Verify: React.FC<{}> = () => {
               <MemberDocIncomingInfo
                 dataSource={memberInfo?.depositDetails}
                 id="incomingInfo"
+                showNew
               />
             </Col>
           ) : null}

src/pages/member/memberPrVerifyChangeConfirm/detail.tsx

@@ -174,6 +174,7 @@ const MemberPrVerifyChangeConfirmDetail: React.FC<{}> = () => {
               <MemberDocIncomingInfo
                 dataSource={memberInfo?.depositDetails}
                 id="incomingInfo"
+                showNew
               />
             </Col>
           ) : null}

src/pages/member/memberPrVerifyChangeConfirm/verify.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-26 10:26:37
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-06-15 16:24:29
+ * @LastEditTime: 2021-07-03 18:05:00
  * @Description: 确认会员变更
  */
 import React, { useState, useEffect } from 'react';
@@ -216,6 +216,7 @@ const MemberPrVerifyChangeConfirmVerify: React.FC<{}> = () => {
               <MemberDocIncomingInfo
                 dataSource={memberInfo?.depositDetails}
                 id="incomingInfo"
+                showNew
               />
             </Col>
           ) : null}