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

src/layouts/SecurityLayout.tsx

@@ -33,7 +33,7 @@ class SecurityLayout extends React.Component<SecurityLayoutProps, SecurityLayout
 
     const perList = [
       { key: '1', path: '/UserManagement/LIFEUserManagement' },
-      { key: '18', path: '/UserManagement/ServiceProviderManagement' },
+      { key: '8', path: '/UserManagement/ServiceProviderManagement' },
       { key: '15', path: '/PropertyManagement' },
       { key: '17', path: '/CommercialService/CommunityMaintenance' },
       { key: '20', path: '/CommercialService/OwnerComplaints' },

src/pages/CommercialService/Detail.tsx

@@ -160,9 +160,9 @@ const Detail = (props: any) => {
               >
                 {!editorFlag ? (
                   <Row gutter={16}>
-                    <Col>Replyer:</Col>
+                    <Col>Attended By:</Col>
                     <Col span={6}>{CurDataDetail.replyName}</Col>
-                    <Col>Contact:</Col>
+                    <Col>Contact Details:</Col>
                     <Col>{CurDataDetail.replyPhone}</Col>
                   </Row>
                 ) : null}

src/pages/CommercialService/RenovationDetail.tsx

@@ -99,15 +99,15 @@ const RenovationDetail = (props: any) => {
             <Row gutter={8} style={{ marginTop: 16 }}>
               <Col>Owner Name:</Col>
               <Col span={3}>{onwerDetail.owerName}</Col>
-              <Col>Phone:</Col>
+              <Col>Contact Details:</Col>
               <Col>{onwerDetail.owerPhone}</Col>
             </Row>
 
             <Line></Line>
             <Row gutter={8} style={{ marginTop: 16 }}>
-              <Col span={3}>Contract Name:</Col>
+              <Col span={3}>Applicant:</Col>
               <Col span={3}>{listData.contactName}</Col>
-              <Col span={3}>Phone:</Col>
+              <Col span={3}>Contact Details:</Col>
               <Col>{listData.contactPhone}</Col>
             </Row>
             <Row gutter={8} style={{ marginTop: 16 }}>
@@ -139,7 +139,7 @@ const RenovationDetail = (props: any) => {
                         rules={[{ required: true, message: 'You have to choose an outcome!' }]}
                       >
                         <Radio.Group>
-                          <Radio.Button value={'1'}>Agree</Radio.Button>{' '}
+                          <Radio.Button value={'1'}>Approve</Radio.Button>{' '}
                           <Radio.Button style={{ marginLeft: 10 }} value={'2'}>
                             Reject
                           </Radio.Button>
@@ -166,9 +166,9 @@ const RenovationDetail = (props: any) => {
             ) : (
               <>
                 <Row>
-                  <Col span={3}>Replyer:</Col>
+                  <Col span={3}>Attended By:</Col>
                   <Col span={3}>{listData.replyName}</Col>
-                  <Col span={3}>Contact: </Col>
+                  <Col span={3}>Contact Details:</Col>
                   <Col>{listData.replyPhone}</Col>
                 </Row>
 
@@ -176,7 +176,7 @@ const RenovationDetail = (props: any) => {
                   <Col span={3}>Approval For Application:</Col>
                   <Col>
                     <Radio.Group value={listData.decorationStatus}>
-                      <Radio.Button value={'1'}>Agree</Radio.Button>{' '}
+                      <Radio.Button value={'1'}>Approve</Radio.Button>{' '}
                       <Radio.Button style={{ marginLeft: 10 }} value={'2'}>
                         Reject
                       </Radio.Button>