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

src/components/TableShow/TableShow.tsx

@@ -71,7 +71,7 @@ const TableShow = (props: any) => {
       <Tabs defaultActiveKey="0">
         {dataRow.map((item: any, index: number) => {
           return (
-            <TabPane tab={item.name} key={index}>
+            <TabPane tab={item.name} key={item.id}>
               <Row gutter={16} style={{ marginLeft: 9 }}>
                 <Col>Address:</Col>
                 <Col>
@@ -143,25 +143,3 @@ const TableShow = (props: any) => {
 };
 
 export default TableShow;
-// User Name
-// Contact Details
-// Email
-// cdk_code
-// Account Type
-// User Status
-// Actions
-
-// address_and_postalCode: "广州石溪5463743"
-// building_number: "01"
-// cdk_code: 792239
-// cdk_status: 1
-// enable: 1
-// floor_number: "5"
-// ower_email: "535740436@qq.com"
-// ower_name: "测试"
-// ower_phone: "微微"
-// room_number: "399"
-
-/* <div style={{ width: 80, height: 80, border: "1px solid #cccccc",padding:8,lineHeight:1,textAlign:"center",fontSize:12}}>
-Activation Code Has Been Used/Is Inactive
-</div> */

src/models/ServiceProvider.ts

@@ -43,9 +43,10 @@ export default {
         let Data = resp.data;
         yield put({ type: 'returnPage', Data });
       } else {
+        console.log(resp);
         console.log('请求错误码:' + resp.error_code);
         message.error(resp.error_msg);
-        let Data = null;
+        let Data = undefined;
         console.log(playload);
         yield put({ type: 'returnPage', Data });
       }

src/pages/UserManagement/LIFEUserManagement/UsersDetail.tsx

@@ -132,6 +132,18 @@ const UsersDetail = (props: any) => {
     }
   }, [DataSaveDetail]);
 
+  useEffect(() => {
+    console.log(memberDetail);
+    if (!memberDetail) {
+      var tmp = {
+        owerName: DataSave.owerName,
+        owerPhone: DataSave.owerPhone,
+        owerEmail: DataSave.owerEmail,
+      };
+      formRef.current.setFieldsValue(tmp);
+    }
+  }, [memberDetail]);
+
   useEffect(() => {
     if (location.pathname.indexOf('Edit') > -1) {
       setEditFlag(true);
@@ -143,6 +155,7 @@ const UsersDetail = (props: any) => {
     console.log('成员信息');
     console.log(values);
     setMemberData(values);
+
     setMemberDetail(true);
   };
 
@@ -161,7 +174,7 @@ const UsersDetail = (props: any) => {
       onCancel() {},
       onOk() {
         if (DataSave != null) {
-          //console.log(DataSave)
+          // console.log(DataSave);
           var tmp = {
             owerName: DataSave.owerName,
             communityName: DataSave.communityName,
@@ -200,6 +213,7 @@ const UsersDetail = (props: any) => {
   useEffect(() => {
     if (memberResult != null) {
       setMemberDetail(false);
+      message.success('Successfully delete!!!');
       RA(13, {
         id: DataSave.id,
         owerName: DataSave.owerName,
@@ -223,6 +237,9 @@ const UsersDetail = (props: any) => {
     callback('*it is required!');
   };
 
+  console.log(memberDetail);
+  console.log(DataSave);
+
   return (
     <div className={styles.base}>
       <Spin spinning={visible} tip="Loading Submit">

src/pages/UserManagement/ServiceProviderManagement/Edit.tsx

@@ -89,10 +89,10 @@ const Edit = (props: any) => {
     val.creator = 'admin';
     val.updater = 'admin';
     val.serviceScopeList = [val.serviceScopeList];
-    console.log(val);
     if (SaveChooseData) {
       val.id = SaveChooseData.id;
     }
+    console.log(val);
     setload(true);
     TosTosServiceProviderSave(val);
   };

src/pages/UserManagement/ServiceProviderManagement/ServiceProviderManagement.tsx

@@ -184,7 +184,7 @@ const ServiceProviderManagement = (props: propsType) => {
 
   // 数据核查
   useEffect(() => {
-    if (Data != null) {
+    if (Data !== null) {
       flag = false;
       setLoading(false);
     }
@@ -276,9 +276,9 @@ const ServiceProviderManagement = (props: propsType) => {
           style={{ marginTop: 16 }}
           loading={loading}
           columns={columns}
-          dataSource={Data !== null ? dataSource(Data.rows) : []}
+          dataSource={Data ? dataSource(Data.rows) : []}
           pagination={
-            Data !== null
+            Data
               ? {
                   current: +readyData.pageNum,
                   total: Data.page.totalRow,