Merge branch 'dev' into test

src/pages/afterService/components/ReturnDetailInfo/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2020-11-05 18:02:18
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-01-06 15:05:32
+ * @LastEditTime: 2021-01-14 20:35:08
  * @Description: 退款明细
  */
 import React, { useState } from 'react';
@@ -237,7 +237,7 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
   const handleConfirmResult = record => {
     setCurrentDetailItem({
       id: record.refundId, 
-      fileList: record.payProveList.map(item => normalizeFiledata(item.proveUrl)), 
+      fileList: record.payProve.fileList ? record.payProve.fileList.map(item => normalizeFiledata(item.proveUrl)) : [], 
     });
     setVisibleResult(true);
   };
@@ -245,7 +245,7 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
   const handleCheck = record => {
     setCurrentDetailItem({ 
       id: record.refundId, 
-      fileList: record.payProveList.map(item => normalizeFiledata(item.proveUrl)), 
+      fileList: record.payProve.fileList ? record.payProve.fileList.map(item => normalizeFiledata(item.proveUrl)) : [], 
     });
   };