Commit fb7e4aba authored by XieZhiXiong's avatar XieZhiXiong

fixbug

parent 414a679b
...@@ -339,7 +339,7 @@ const ExchangeForm: React.FC<BillsFormProps> = ({ ...@@ -339,7 +339,7 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
}, },
proofFileList: proofFileList.filter(item => item.status === 'done').map(item => ({ proofFileList: proofFileList.filter(item => item.status === 'done').map(item => ({
fileName: item.name, fileName: item.name,
filePath: item.data, filePath: item.data.url,
})), })),
replaceGoodsList: replaceGoodsList.map(({ replaceGoodsList: replaceGoodsList.map(({
id, id,
......
...@@ -193,7 +193,7 @@ const RepairForm: React.FC<BillsFormProps> = ({ ...@@ -193,7 +193,7 @@ const RepairForm: React.FC<BillsFormProps> = ({
repairAddress: repairAddress ? JSON.stringify(repairAddress) : '', repairAddress: repairAddress ? JSON.stringify(repairAddress) : '',
faultFileList: faultFileList.filter(item => item.status === 'done').map(item => ({ faultFileList: faultFileList.filter(item => item.status === 'done').map(item => ({
fileName: item.name, fileName: item.name,
filePath: item.data, filePath: item.data.url,
})), })),
repairGoodsList: repairGoodsList.map(({ repairGoodsList: repairGoodsList.map(({
id, id,
......
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
&-main { &-main {
position: relative; position: relative;
width: 128px; width: 328px;
height: 38px; height: 38px;
padding-bottom: 8px; padding-bottom: 8px;
......
...@@ -80,7 +80,16 @@ const QuotaApplicationInfo: React.FC<QuotaApplicationInfo> = ({ ...@@ -80,7 +80,16 @@ const QuotaApplicationInfo: React.FC<QuotaApplicationInfo> = ({
applyQuota: +applyQuota, applyQuota: +applyQuota,
billDay: +billDay, billDay: +billDay,
repayPeriod: +repayPeriod, repayPeriod: +repayPeriod,
fileList: fileList.filter(item => item.status === 'done'), fileList:
fileList
.filter(item => item.status === 'done')
.map(item => {
const { data, ...rest } = item;
return {
data: data.url,
...rest,
}
}),
...rest, ...rest,
}); });
setModalVisible(false); setModalVisible(false);
......
...@@ -274,7 +274,7 @@ class IntroduceRow extends React.Component<IntroduceRowProps, IntroduceRowState> ...@@ -274,7 +274,7 @@ class IntroduceRow extends React.Component<IntroduceRowProps, IntroduceRowState>
...repaymentValues, ...repaymentValues,
payProveList: payProveList.map(item => ({ payProveList: payProveList.map(item => ({
name: item.name, name: item.name,
proveUrl: item.data, proveUrl: item.data.url,
})), })),
}).then(res => { }).then(res => {
if (res.code === 1000) { if (res.code === 1000) {
......
...@@ -142,7 +142,10 @@ const QuotaMenage: React.FC = () => { ...@@ -142,7 +142,10 @@ const QuotaMenage: React.FC = () => {
record.quota === 0 && record.quota === 0 &&
record.status === CREDIT_STATUS_NOT_APPLIED record.status === CREDIT_STATUS_NOT_APPLIED
) || ) ||
!!record.isCanApply (
!!record.isCanApply &&
record.status === CREDIT_STATUS_NORMAL
)
) && ( ) && (
<Button <Button
type="link" type="link"
......
...@@ -15,7 +15,7 @@ import { createFormActions, FormEffectHooks, FormPath } from '@formily/antd'; ...@@ -15,7 +15,7 @@ import { createFormActions, FormEffectHooks, FormPath } from '@formily/antd';
import { usePageStatus, PageStatus } from '@/hooks/usePageStatus'; import { usePageStatus, PageStatus } from '@/hooks/usePageStatus';
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
import { GetOrderPurchaseOrderDetailsResponse } from '@/services/OrderApi'; import { GetOrderPurchaseOrderDetailsResponse } from '@/services/OrderApi';
import { normalizeFiledata, isJSONStr } from '@/utils'; import { normalizeFiledata, FileData, isJSONStr } from '@/utils';
import AvatarWrap from '@/components/AvatarWrap'; import AvatarWrap from '@/components/AvatarWrap';
import NiceForm from '@/components/NiceForm'; import NiceForm from '@/components/NiceForm';
import { normalizeUnevaluatedList } from '../../utils'; import { normalizeUnevaluatedList } from '../../utils';
...@@ -35,7 +35,7 @@ interface Unevaluated { ...@@ -35,7 +35,7 @@ interface Unevaluated {
}; };
star: number; star: number;
comment: string; comment: string;
picture: string[]; picture: FileData[];
smile: number; smile: number;
}; };
......
...@@ -103,7 +103,7 @@ const EvaluateOrder: React.FC = () => { ...@@ -103,7 +103,7 @@ const EvaluateOrder: React.FC = () => {
dealCount: good.purchaseCount, dealCount: good.purchaseCount,
price: good.price, price: good.price,
totalPrice: orderInfo.sumPrice, totalPrice: orderInfo.sumPrice,
pics: picture.map(item => item.status === 'done' && item.data).filter(Boolean), pics: picture.map(item => item.status === 'done' && item.data.url).filter(Boolean),
}; };
}); });
......
...@@ -15,7 +15,7 @@ import { createFormActions, FormEffectHooks, FormPath } from '@formily/antd'; ...@@ -15,7 +15,7 @@ import { createFormActions, FormEffectHooks, FormPath } from '@formily/antd';
import { usePageStatus, PageStatus } from '@/hooks/usePageStatus'; import { usePageStatus, PageStatus } from '@/hooks/usePageStatus';
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
import { GetOrderPurchaseOrderDetailsResponse } from '@/services/OrderApi'; import { GetOrderPurchaseOrderDetailsResponse } from '@/services/OrderApi';
import { normalizeFiledata, isJSONStr } from '@/utils'; import { normalizeFiledata, FileData, isJSONStr } from '@/utils';
import AvatarWrap from '@/components/AvatarWrap'; import AvatarWrap from '@/components/AvatarWrap';
import NiceForm from '@/components/NiceForm'; import NiceForm from '@/components/NiceForm';
import { normalizeUnevaluatedList } from '../../utils'; import { normalizeUnevaluatedList } from '../../utils';
...@@ -35,7 +35,7 @@ interface Unevaluated { ...@@ -35,7 +35,7 @@ interface Unevaluated {
}; };
star: number; star: number;
comment: string; comment: string;
picture: string[]; picture: FileData[];
smile: number; smile: number;
}; };
......
...@@ -103,7 +103,7 @@ const EvaluateOrder: React.FC = () => { ...@@ -103,7 +103,7 @@ const EvaluateOrder: React.FC = () => {
dealCount: good.purchaseCount, dealCount: good.purchaseCount,
price: good.price, price: good.price,
totalPrice: orderInfo.sumPrice, totalPrice: orderInfo.sumPrice,
pics: picture.map(item => item.status === 'done' && item.data).filter(Boolean), pics: picture.map(item => item.status === 'done' && item.data.url).filter(Boolean),
}; };
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment