Commit e4f72d22 authored by cellee's avatar cellee

Merge branch 'final' of http://120.77.240.215:9701/Maple/tostumi.git into final

parents b91a4321 30a05194
...@@ -119,7 +119,7 @@ const UsersDetail = (props: any) => { ...@@ -119,7 +119,7 @@ const UsersDetail = (props: any) => {
// 监听数据返回 // 监听数据返回
useEffect(() => { useEffect(() => {
if (DataSaveDetail != null) { if (DataSaveDetail !== null) {
setDataSaveLoading(false); setDataSaveLoading(false);
} }
}, [DataSaveDetail]); }, [DataSaveDetail]);
...@@ -239,7 +239,7 @@ const UsersDetail = (props: any) => { ...@@ -239,7 +239,7 @@ const UsersDetail = (props: any) => {
<Spin spinning={visible} tip="Loading Submit"> <Spin spinning={visible} tip="Loading Submit">
{memberDetail === false ? ( {memberDetail === false ? (
<> <>
{DataSave != null ? ( {DataSave !== null ? (
<> <>
<TitleBack <TitleBack
sublist={[ sublist={[
...@@ -293,7 +293,7 @@ const UsersDetail = (props: any) => { ...@@ -293,7 +293,7 @@ const UsersDetail = (props: any) => {
<Spin spinning={DataSaveLoading} tip="Loading Detial"> <Spin spinning={DataSaveLoading} tip="Loading Detial">
{DataSaveDetail ? ( {DataSaveDetail ? (
<> <>
{DataSaveDetail.rows[0].owner.deleted !== 1 ? ( {DataSaveDetail.rows[0]?.owner.deleted !== 1 ? (
<> <>
<TableShow <TableShow
data={DataSaveDetail} data={DataSaveDetail}
...@@ -303,7 +303,7 @@ const UsersDetail = (props: any) => { ...@@ -303,7 +303,7 @@ const UsersDetail = (props: any) => {
/> />
</> </>
) : null} ) : null}
{editFlag && DataSaveDetail.rows[0].owner.deleted !== 1 ? ( {editFlag && DataSaveDetail.rows[0]?.owner.deleted !== 1 ? (
<> <>
<Line /> <Line />
<Form.Item style={{ textAlign: 'left' }}> <Form.Item style={{ textAlign: 'left' }}>
......
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