Merge branch 'master' into develop

kustomization/overlays/prod/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/admin
-  newTag: cc1ebccedbfcd03220d7ae2615af87e5a3d9ce04
+  newTag: 4965923d95520a511bc18e51605b6877096bbceb

src/api/interface/flyerCenterType.ts

@@ -27,6 +27,7 @@ type flyerItemType = {
   userName: number;
   yearsOfWorking: number;
   reason: string;
+  pilotResume?: string;
 };
 export type backListPilotType = InterItemFunction<
   {

src/pages/flyerManage/flyerDetail/index.tsx

 import { FlyerCenterAPI } from '~/api';
 import { useSearchParams, useNavigate } from 'react-router-dom';
-import { useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { InterDataType } from '~/api/interface';
 import { backDetailPilotType } from '~/api/interface/flyerCenterType';
 import { Badge, Button, Col, Descriptions, Image, Row, Tag } from 'antd';
 import './index.scss';
 import ApproveModal from './components/approveModal';
+import { PlusOutlined } from '@ant-design/icons';
+import { Uploader } from '~/components/uploader';
 
 //飞手详情返回类型
 type flyerDetailType = InterDataType<backDetailPilotType>;
@@ -38,6 +40,14 @@ const FlyerDetail = () => {
   const backRoute = () => {
     navigate(-1);
   };
+  // 转换飞手简历
+  const getPilotResume = () => {
+    try {
+      return JSON.parse(flyerDetail?.pilotResume || '[]');
+    } catch (e) {
+      return [];
+    }
+  };
 
   useEffect(() => {
     getFlyerDetail(Number(searchParams.get('id')));
@@ -78,15 +88,15 @@ const FlyerDetail = () => {
                     flyerDetail?.auditStatus === 0
                       ? 'processing'
                       : flyerDetail?.auditStatus === 1
-                      ? 'success'
-                      : 'error'
+                        ? 'success'
+                        : 'error'
                   }
                   text={
                     flyerDetail?.auditStatus === 0
                       ? '审核中'
                       : flyerDetail?.auditStatus === 1
-                      ? '已通过'
-                      : '未通过'
+                        ? '已通过'
+                        : '未通过'
                   }
                 />
                 {flyerDetail?.auditStatus === 2 ? (
@@ -101,6 +111,16 @@ const FlyerDetail = () => {
               <Descriptions.Item label='执照图片'>
                 <Image src={flyerDetail?.licenseUrl} width={100} />
               </Descriptions.Item>
+              <Descriptions.Item label='飞手简历'>
+                <Uploader
+                  listType={'picture-card'}
+                  fileUpload
+                  disabled={true}
+                  defaultFileList={getPilotResume()}
+                >
+                  <PlusOutlined />
+                </Uploader>
+              </Descriptions.Item>
             </Descriptions>
           </div>
         </Col>
@@ -110,9 +130,7 @@ const FlyerDetail = () => {
               <Descriptions.Item label='常驻地'>{flyerDetail?.residentCity}</Descriptions.Item>
               <Descriptions.Item label='工作年限'>{flyerDetail?.yearsOfWorking}</Descriptions.Item>
               <Descriptions.Item label='能力'>
-                {flyerDetail?.pilotAbility.map((v) => (
-                  <Tag key={v.id}>{v.abilityName}</Tag>
-                ))}
+                {flyerDetail?.pilotAbility.map((v) => <Tag key={v.id}>{v.abilityName}</Tag>)}
               </Descriptions.Item>
               <Descriptions.Item label='业务案例'>
                 {flyerDetail?.abilityUrl ? (