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

src/models/CommunityManagement/CommunityService.ts

@@ -89,19 +89,23 @@ export default {
                 content: string;
                 replyContent: string;
                 replyImgUrl: string[];
+                replyName: string;
+                replyPhone: string;
                 status: number;
                 pictrues: string[];
                 time: string;
               } = {
                 community: tmp.communityName || tmp.communityName,
                 address: tmp.addressAndpostalCode || tmp.residentialAddress,
-                home: (tmp.buildingNumber || tmp.communityBuild) + ' #' + (tmp.floorNumber ||  tmp.communityFloor) + '-' + (tmp.roomNumber || tmp.communtiyRoom),
+                home: (tmp.buildingNumber || tmp.communityBuild) + ' #' + (tmp.floorNumber || tmp.communityFloor) + '-' + (tmp.roomNumber || tmp.communtiyRoom),
                 name: tmp.owerName || tmp.ownerFamilyName,
                 phone: tmp.owerPhone || tmp.ownerFamilyPhone,
                 email: tmp.owerEmail || tmp.ownerFamilyEmail,
                 content: tmp2.serviceContent,
                 replyContent: tmp2.replyContent,
                 replyImgUrl: Fromate(tmp2.replyImgUrl, [['url', null]]),
+                replyName: tmp2.handleName,
+                replyPhone: tmp2.handleContacts,
                 status: tmp2.handleStatus,
                 pictrues: picFromate(tmp2.imgUrl),
                 time: timestampToTime4(tmp2.createTime.time),

src/pages/CommercialService/Detail.tsx

@@ -161,9 +161,9 @@ const Detail = (props: any) => {
                 {!editorFlag ? (
                   <Row gutter={16}>
                     <Col>Replyer:</Col>
-                    <Col span={6}>{getCookie('name')}</Col>
+                    <Col span={6}>{CurDataDetail.replyName}</Col>
                     <Col>Contact:</Col>
-                    <Col>{getCookie('phone')}</Col>
+                    <Col>{CurDataDetail.replyPhone}</Col>
                   </Row>
                 ) : null}
                 <Row gutter={16} style={{ marginTop: 20 }}>

src/pages/CommercialService/PropertyServices.tsx

@@ -57,7 +57,7 @@ const PropertyServices = (props: any) => {
       dataIndex: parseInt(serviceTypeGobal) - 1 === 0 ? 'handle_name' : 'service_content',
       ellipsis: true,
       // width: 400,
-      render: (text: any) => <Space size="middle">{text != null ? text : ''}</Space>,
+      render: (text: any) => <span>{text != null ? text : ''}</span>,
     },
 
     {

src/pages/UserManagement/LIFEUserManagement/ResultPage.tsx

-import React, { useState, useEffect,useRef} from 'react';
-import { Input ,Tabs,Table,Result, Button} from 'antd';
-const { TabPane } = Tabs;
-
-import {connect,history} from 'umi';
-
-
-import { RA } from '@/utils/method';
-const module="User"
-const ResultPage = (props:any) => {
-
-  const { dispatch, Data } = props;
-  const formRef = useRef(null)
+import React, { useState, useEffect } from 'react';
+import { Result, Button } from 'antd';
 
+import { connect, history } from 'umi';
+const module = 'User';
+const ResultPage = () => {
   const [resultTime, setResultTime] = useState(3);
 
-  function loop(i:number) {
+  function loop(i: number) {
     if (i < 4) {
-      console.log(i)
+      console.log(i);
 
-      setResultTime(4-i)
-      setTimeout(function(){loop(++i)},1000)
+      setResultTime(4 - i);
+      setTimeout(function () {
+        loop(++i);
+      }, 1000);
     } else {
-      setResultTime(0)
-      history.go(-1)
+      setResultTime(0);
+      history.go(-1);
     }
   }
- 
 
-  useEffect(()=>{    
-    loop(1)
-  },[])
-  const backPage = () => {
-    
-  }
+  useEffect(() => {
+    loop(1);
+  }, []);
+  const backPage = () => {};
   return (
-    <div style={{ width: "100%", minWidth: 1020, padding: 34, backgroundColor: "#ffffff" }}> 
-            <Result
-          status="success"
-          title="Successfully submit the file!"
-          subTitle={<p>server has been handled it ,Wait for <strong>{resultTime}</strong> seconds to return automatically.</p>}
-          extra={[
-            <Button type="primary" key="ok" onClick={backPage}>Ok</Button>, <Button key="back" onClick={backPage}>Back</Button>
-          ]}
-        />  
+    <div style={{ width: '100%', minWidth: 1020, padding: 34, backgroundColor: '#ffffff' }}>
+      <Result
+        status="success"
+        title="Successfully submit the file!"
+        subTitle={
+          <p>
+            server has been handled it ,Wait for <strong>{resultTime}</strong> seconds to return
+            automatically.
+          </p>
+        }
+        extra={[
+          <Button type="primary" key="ok" onClick={backPage}>
+            Ok
+          </Button>,
+          <Button key="back" onClick={backPage}>
+            Back
+          </Button>,
+        ]}
+      />
     </div>
   );
 };
 
-function map(state:any) {
-  const { Data} = state[module]
-  return { Data}
+function map(state: any) {
+  const { Data } = state[module];
+  return { Data };
 }
-export default connect(map)(ResultPage);
+export default connect(map)(ResultPage);
\ No newline at end of file

src/pages/UserManagement/LIFEUserManagement/ResultPageFailed.tsx

 import React, { useState, useEffect } from 'react';
-import { Result, Button } from 'antd';
+import { Result, Button, message } from 'antd';
 
 import { connect, history } from 'umi';
 
 const module = 'User';
-const ResultPageFailed = (props: any) => {
-  const [resultId, setResultId] = useState(3);
-
+const ResultPageFailed = () => {
+  const [resultId, setResultId] = useState('');
+  const [flag, setFlag] = useState(true);
   const backPage = () => {
     history.go(-1);
   };
 
   useEffect(() => {
     const id = localStorage.getItem('userInfo') || '';
-
     setResultId(JSON.parse(id).userModel.id);
   }, []);
+
+  const handleDownload = () => {
+    if (flag) {
+      setFlag(false);
+    } else {
+      message.success('The file has been downloaded successfully');
+    }
+  };
+
   return (
     <div style={{ width: '100%', minWidth: 1020, padding: 34, backgroundColor: '#ffffff' }}>
       <Result
@@ -23,11 +31,17 @@ const ResultPageFailed = (props: any) => {
         title="Error submit the file!"
         subTitle={<p>server has been handled it ,please try again or back.</p>}
         extra={[
-          <Button type="primary" key="ok">
+          <Button type="primary" key="ok" onClick={handleDownload}>
+            {flag ? (
+              <a href={'http://192.168.1.28:8651/tos/excel/down?operator_id=' + resultId}>
+                Download
+              </a>
+            ) : (
+              'Download'
+            )}
             {/* <a href={'http://47.74.233.180:8651/tos/excel/down?operator_id=' + resultId}>
               Download
             </a> */}
-            <a href={'http://192.168.1.28:8651/tos/excel/down?operator_id=' + resultId}>Download</a>
           </Button>,
           <Button key="back" onClick={backPage}>
             Back