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

src/pages/member/memberPrVerifyComingData/verify.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-24 17:01:57
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-12 17:47:44
+ * @LastEditTime: 2021-07-14 11:43:28
  * @Description: 审核入库资料
  */
 import React, { useState, useRef } from 'react';
@@ -111,6 +111,15 @@ const MemberPrVerifyComingDataVerify: React.FC<{}> = () => {
     }),
     fetchCallback: (info) => {
       // 要手动将旧数据带过去
+      const depositDetails = {};
+      info.depositDetails.forEach((item) => {
+        if (item.elements) {
+          item.elements.forEach((ele) => {
+            depositDetails[ele.fieldName] = ele.fieldValue;
+          });
+        }
+      });
+      setComingData(depositDetails);
       setQualifications(info.qualities.map((item) => ({
         file: item.url ? [normalizeFiledata(item.url)] : [],
         expireDay: item.expireDay,

src/pages/member/memberQuery/applyMember/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-26 16:52:48
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-06 10:22:59
+ * @LastEditTime: 2021-07-14 11:46:08
  * @Description: 申请会员
  */
 import React, { useState, useEffect, useRef } from 'react';
@@ -140,7 +140,7 @@ const MemberQueryApplyMember: React.FC<RouteComponentProps> = (props: any) => {
     setLoading(false);
   };
 
-  // 修改操作
+  // 变更、修改操作
   // 根据审核id 获取入库资料
   const getDepositInfoByValidateId = async () => {
     if (!validateId) {