Skip to content

J
jinfa-platform
Commit d1087c35 authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

调整详情页面 loading

parent f7bd6623
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 68 deletions
config/routes/payandSettle.ts
View file @ d1087c35
......@@ -3,7 +3,7 @@
* @Date: 2020-08-19 15:33:27
* @LastEditors: XieZhiXiong
* @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-10-28 20:24:11
* @LastEditTime: 2020-10-30 16:00:56
*/
import { RouterChild } from '../utils/index';
......@@ -42,6 +42,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaMenageDetail',
component: '@/pages/payandSettle/creditApplication/quotaMenage/detail/index',
hideInMenu: true,
noMargin: true,
},
// 授信额度管理-申请
{
......@@ -49,6 +50,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaApply',
component: '@/pages/payandSettle/creditApplication/quotaMenage/apply',
hideInMenu: true,
noMargin: true,
},
// 授信额度管理-历史申请单详情
{
......@@ -56,6 +58,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaApply',
component: '@/pages/payandSettle/creditApplication/quotaFormQuery/detail',
hideInMenu: true,
noMargin: true,
},
// 授信申请单查询
{
......@@ -69,6 +72,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaFormQueryDetail',
component: '@/pages/payandSettle/creditApplication/quotaFormQuery/detail',
hideInMenu: true,
noMargin: true,
},
// 待提交授信申请单
{
......@@ -82,6 +86,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaPrSubmitDetail',
component: '@/pages/payandSettle/creditApplication/quotaPrSubmit/detail',
hideInMenu: true,
noMargin: true,
},
// 待提交授信申请单-编辑
{
......@@ -89,6 +94,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaPrSubmitDetail',
component: '@/pages/payandSettle/creditApplication/quotaPrSubmit/verify',
hideInMenu: true,
noMargin: true,
},
],
},
......@@ -109,6 +115,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaMenageDetail',
component: '@/pages/payandSettle/creditManage/quotaMenage/detail/index',
hideInMenu: true,
noMargin: true,
},
// 授信额度管理-历史申请单详情
{
......@@ -116,6 +123,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaFormQueryDetail',
component: '@/pages/payandSettle/creditManage/quotaFormQuery/detail',
hideInMenu: true,
noMargin: true,
},
// 授信申请单查询
{
......@@ -129,6 +137,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaFormQueryDetail',
component: '@/pages/payandSettle/creditManage/quotaFormQuery/detail',
hideInMenu: true,
noMargin: true,
},
// 待提交授信申请单
{
......@@ -142,6 +151,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaPrSubmitDetail',
component: '@/pages/payandSettle/creditManage/quotaPrSubmit/detail',
hideInMenu: true,
noMargin: true,
},
// 待提交授信申请单-审核
{
......@@ -149,6 +159,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaPrSubmitDetail',
component: '@/pages/payandSettle/creditManage/quotaPrSubmit/verify',
hideInMenu: true,
noMargin: true,
},
// 待提交授信申请单-历史申请单详情
{
......@@ -156,6 +167,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaFormQueryDetail',
component: '@/pages/payandSettle/creditManage/quotaFormQuery/detail',
hideInMenu: true,
noMargin: true,
},
// 待审核授信申请单（一级）
{
......@@ -169,6 +181,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaPr1Detail',
component: '@/pages/payandSettle/creditManage/quotaPr1/detail',
hideInMenu: true,
noMargin: true,
},
// 待审核授信申请单（一级）-审核
{
......@@ -176,6 +189,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaPr1Verify',
component: '@/pages/payandSettle/creditManage/quotaPr1/verify',
hideInMenu: true,
noMargin: true,
},
// 待审核授信申请单（一级）-历史申请单详情
{
......@@ -183,6 +197,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaFormQueryDetail',
component: '@/pages/payandSettle/creditManage/quotaFormQuery/detail',
hideInMenu: true,
noMargin: true,
},
// 待审核授信申请单（二级）
{
......@@ -196,6 +211,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaPr2Detail',
component: '@/pages/payandSettle/creditManage/quotaPr2/detail',
hideInMenu: true,
noMargin: true,
},
// 待审核授信申请单（二级）-审核
{
......@@ -203,6 +219,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaPr2Verify',
component: '@/pages/payandSettle/creditManage/quotaPr2/verify',
hideInMenu: true,
noMargin: true,
},
// 待审核授信申请单（二级）-历史申请单详情
{
......@@ -210,6 +227,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaFormQueryDetail',
component: '@/pages/payandSettle/creditManage/quotaFormQuery/detail',
hideInMenu: true,
noMargin: true,
},
// 待审核授信申请单（三级）
{
......@@ -223,6 +241,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaPr3Detail',
component: '@/pages/payandSettle/creditManage/quotaPr3/detail',
hideInMenu: true,
noMargin: true,
},
// 待审核授信申请单（三级）-审核
{
......@@ -230,6 +249,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaPr3Verify',
component: '@/pages/payandSettle/creditManage/quotaPr3/verify',
hideInMenu: true,
noMargin: true,
},
// 待审核授信申请单（三级）-历史申请单详情
{
......@@ -237,6 +257,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaFormQueryDetail',
component: '@/pages/payandSettle/creditManage/quotaFormQuery/detail',
hideInMenu: true,
noMargin: true,
},
// 待确认授信申请单
{
......@@ -250,6 +271,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaPrConfirmDetail',
component: '@/pages/payandSettle/creditManage/quotaPrConfirm/detail',
hideInMenu: true,
noMargin: true,
},
// 待确认授信申请单-审核
{
......@@ -257,6 +279,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaPrConfirmVerify',
component: '@/pages/payandSettle/creditManage/quotaPrConfirm/verify',
hideInMenu: true,
noMargin: true,
},
// 待确认授信申请单-历史申请单详情
{
......@@ -264,6 +287,7 @@ const payandSettleRoute: RouterChild = {
name: 'quotaFormQueryDetail',
component: '@/pages/payandSettle/creditManage/quotaFormQuery/detail',
hideInMenu: true,
noMargin: true,
},
],
},
......
src/pages/payandSettle/creditApplication/components/DetailInfo/index.tsx
View file @ d1087c35
......@@ -117,7 +117,10 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
return (
<Spin spinning={infoLoading}>
<PageHeaderWrapper
<PageHeaderWrapper
style={{
padding: 24,
}}
title={
<>
<PageHeader
......
src/pages/payandSettle/creditApplication/quotaMenage/detail/index.tsx
View file @ d1087c35
......@@ -136,6 +136,9 @@ const QuotaMenageDetail: React.FC = () => {
return (
<Spin spinning={infoLoading}>
<PageHeaderWrapper
style={{
padding: 24,
}}
title={
<>
<PageHeader
......
src/pages/payandSettle/creditManage/components/DetailInfo/index.tsx
View file @ d1087c35
......@@ -134,6 +134,9 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
return (
<Spin spinning={infoLoading}>
<PageHeaderWrapper
style={{
padding: 24,
}}
title={
<>
<PageHeader
......@@ -143,7 +146,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<AvatarWrap
info={{
aloneTxt: '单',
name: `申请单号：${quotaInfo?.member?.applyNo}`,
name: `申请单号：${quotaInfo && quotaInfo.member ? quotaInfo.member.applyNo : ''}`,
}}
extra={quotaInfo?.member?.levelTag}
/>
......
src/pages/payandSettle/creditManage/quotaMenage/detail/index.tsx
View file @ d1087c35
......@@ -132,74 +132,79 @@ const QuotaMenageDetail: React.FC = () => {
};
return (
<PageHeaderWrapper
title={
<>
<PageHeader
style={{ padding: '0' }}
onBack={() => history.goBack()}
title={
<AvatarWrap
info={{
name: creditInfo?.member?.memberName,
}}
extra={creditInfo?.member?.levelTag}
/>
}
extra={(
<>
</>
)}
>
<Descriptions
size="small"
column={3}
style={{
padding: '0 32px',
}}
>
<Descriptions.Item label="会员类型">{creditInfo?.member?.memberTypeName}</Descriptions.Item>
<Descriptions.Item label="会员角色" span={2}>{creditInfo?.member?.roleName}</Descriptions.Item>
<Descriptions.Item label="状态">
<Badge
color={CREDIT_STATUS_BADGE_MAP[creditInfo?.member?.status]}
text={CREDIT_STATUS[creditInfo?.member?.status]}
<Spin spinning={infoLoading}>
<PageHeaderWrapper
style={{
padding: 24,
}}
title={
<>
<PageHeader
style={{ padding: '0' }}
onBack={() => history.goBack()}
title={
<AvatarWrap
info={{
name: creditInfo?.member?.memberName,
}}
extra={creditInfo?.member?.levelTag}
/>
</Descriptions.Item>
<Descriptions.Item label="会员状态" span={2}>
<StatusTag type="success" title="正常" />
</Descriptions.Item>
</Descriptions>
</PageHeader>
</>
}
>
<Suspense fallback={null}>
<IntroduceRow
quotaData={quotaData}
extraData={{
canUseQuota: creditInfo?.canUseQuota,
useQuota: creditInfo?.useQuota,
quota: creditInfo?.quota,
}}
options={normalizeOptions(creditInfo?.billSelectList)}
fetchBillDetail={fetchBillDetail}
fetchBillRecordList={fetchBillRecordList}
/>
</Suspense>
}
extra={(
<>
</>
)}
>
<Descriptions
size="small"
column={3}
style={{
padding: '0 32px',
}}
>
<Descriptions.Item label="会员类型">{creditInfo?.member?.memberTypeName}</Descriptions.Item>
<Descriptions.Item label="会员角色" span={2}>{creditInfo?.member?.roleName}</Descriptions.Item>
<Descriptions.Item label="状态">
<Badge
color={CREDIT_STATUS_BADGE_MAP[creditInfo?.member?.status]}
text={CREDIT_STATUS[creditInfo?.member?.status]}
/>
</Descriptions.Item>
<Descriptions.Item label="会员状态" span={2}>
<StatusTag type="success" title="正常" />
</Descriptions.Item>
</Descriptions>
</PageHeader>
</>
}
>
<Suspense fallback={null}>
<IntroduceRow
quotaData={quotaData}
extraData={{
canUseQuota: creditInfo?.canUseQuota,
useQuota: creditInfo?.useQuota,
quota: creditInfo?.quota,
}}
options={normalizeOptions(creditInfo?.billSelectList)}
fetchBillDetail={fetchBillDetail}
fetchBillRecordList={fetchBillRecordList}
/>
</Suspense>
<Suspense fallback={null}>
<BillInfo overdueList={creditOverdueList} loading={creditOverdueListLoading} />
</Suspense>
<Suspense fallback={null}>
<BillInfo overdueList={creditOverdueList} loading={creditOverdueListLoading} />
</Suspense>
<Suspense fallback={null}>
<HistoryList
dataSource={creditInfo?.historyApplyList}
target="/memberCenter/payandSettle/creditManage/quotaMenage/history"
/>
</Suspense>
</PageHeaderWrapper>
<Suspense fallback={null}>
<HistoryList
dataSource={creditInfo?.historyApplyList}
target="/memberCenter/payandSettle/creditManage/quotaMenage/history"
/>
</Suspense>
</PageHeaderWrapper>
</Spin>
);
};
......
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