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

src/pages/CommercialService/CardDetail.tsx

@@ -71,10 +71,11 @@ const CardDetail = (props: any) => {
           : values.replyContent,
       type: '7',
     };
-    console.log(tmp);
+
     RA(34, tmp, module, dispatch);
     setLoading(true);
   };
+  console.log(listData);
 
   return (
     <Spin size="large" spinning={loading}>
@@ -107,14 +108,16 @@ const CardDetail = (props: any) => {
               <Col>Owner Name:</Col>
               <Col span={3}>{onwerDetail.owerName}</Col>
               <Col>Contact Details:</Col>
-              <Col>{onwerDetail.owerPhone}</Col>
+              <Col span={2}>{onwerDetail.owerPhone}</Col>
+              <Col>{onwerDetail.owerEmail}</Col>
             </Row>
             <Line></Line>
             <Row gutter={8} style={{ marginTop: 16 }}>
               <Col span={3}>Applicant:</Col>
               <Col span={3}>{listData.apply_name}</Col>
               <Col>Contact Details:</Col>
-              <Col>{listData.apply_name_phone}</Col>
+              <Col span={2}>{listData.apply_name_phone}</Col>
+              <Col>{listData.apply_name_email}</Col>
             </Row>
             <Row gutter={8} style={{ marginTop: 16 }}>
               <Col span={3}>Relationship:</Col>
@@ -136,7 +139,7 @@ const CardDetail = (props: any) => {
               <Form ref={formRef} name="basic" onFinish={onFinish}>
                 <Row gutter={8} style={{ marginTop: 16 }}>
                   <Col span={3}>Approval For Application:</Col>
-                  <Col span={5}>
+                  <Col span={6}>
                     <Form.Item
                       name="applyStatus"
                       rules={[

src/pages/CommercialService/RenovationDetail.tsx

@@ -100,15 +100,17 @@ const RenovationDetail = (props: any) => {
               <Col>Owner Name:</Col>
               <Col span={3}>{onwerDetail.owerName}</Col>
               <Col>Contact Details:</Col>
-              <Col>{onwerDetail.owerPhone}</Col>
+              <Col span={2}>{onwerDetail.owerPhone}</Col>
+              <Col>{onwerDetail.owerEmail}</Col>
             </Row>
 
             <Line></Line>
             <Row gutter={8} style={{ marginTop: 16 }}>
               <Col span={3}>Applicant:</Col>
               <Col span={3}>{listData.contactName}</Col>
-              <Col span={3}>Contact Details:</Col>
-              <Col>{listData.contactPhone}</Col>
+              <Col>Contact Details:</Col>
+              <Col span={2}>{listData.contactPhone}</Col>
+              <Col>{listData.contactEmail}</Col>
             </Row>
             <Row gutter={8} style={{ marginTop: 16 }}>
               <Col span={3}>Time:</Col>