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

src/components/TableShow/TableShow.tsx

@@ -38,8 +38,8 @@ const TableShow = (props: any) => {
 
   const key = objectColumns([
     ['User Name', 'owner_family_name'],
-    ['Contact Number', 'owner_family_phone', (text: string, record: any) => text || '--'],
-    ['Email', 'owner_family_email', (text: string, record: any) => text || '--'],
+    ['Contact Number', 'owner_family_phone', (text: string, record: any) => text],
+    ['Email', 'owner_family_email', (text: string, record: any) => text],
     [
       'User Type',
       null,

src/locales/en-US/menu.ts

@@ -52,7 +52,7 @@ export default {
 
   'menu.usemanagement': 'User Management',
   'menu.monitoringcenter': 'Monitoring Center',
-  'menu.usemanagement.lifeusers': 'LIFE User Management',
+  'menu.usemanagement.lifeusers': 'Life User Management',
   'menu.usemanagement.serviceproviders': 'Service Provider Management',
   'menu.propertymanagement': 'Property Fee Management',
   'menu.commercialservice': 'Commercial Service',

src/locales/zh-CN/menu.ts

@@ -52,7 +52,7 @@ export default {
 
   'menu.usemanagement': '用户管理',
   'menu.monitoringcenter': '监控中心',
-  'menu.usemanagement.lifeusers': 'LIFE用户管理',
+  'menu.usemanagement.lifeusers': 'Life用户管理',
   'menu.usemanagement.serviceproviders': '服务商管理',
   'menu.propertymanagement': '物业费管理',
   'menu.commercialservice': '物业服务',

src/pages/CommercialService/Detail.tsx

@@ -106,17 +106,19 @@ const Detail = (props: any) => {
             <div className={styles.base}>
               <TitleBack {...titleProps} />
 
-              <Descriptions>
-                <Descriptions.Item>{CurDataDetail.community}</Descriptions.Item>
-                <Descriptions.Item span={2}>{CurDataDetail.home}</Descriptions.Item>
-                <Descriptions.Item label="Address" span={3}>
+              <Descriptions column={2}>
+                <Descriptions.Item span={2}>
+                  {CurDataDetail.community} &nbsp;&nbsp;&nbsp;&nbsp; {CurDataDetail.home}
+                </Descriptions.Item>
+                <Descriptions.Item label="Address" span={2}>
                   {CurDataDetail.address}{' '}
                 </Descriptions.Item>
-                <Descriptions.Item label="User Name" span={3}>
+                <Descriptions.Item label="User Name" span={2}>
                   {CurDataDetail.name}
                 </Descriptions.Item>
-                <Descriptions.Item label="Contact Details">{CurDataDetail.phone}</Descriptions.Item>
-                <Descriptions.Item>{CurDataDetail.email}</Descriptions.Item>
+                <Descriptions.Item label="Contact Details" span={2}>
+                  {CurDataDetail.phone} &nbsp;&nbsp;&nbsp;&nbsp; {CurDataDetail.email}
+                </Descriptions.Item>
               </Descriptions>
               <Row gutter={16}>
                 <Col span={3}>Description:</Col>
@@ -180,8 +182,6 @@ const Detail = (props: any) => {
                   <Col span={3}></Col>
                   <Col>
                     {/* putSubmit={PictureOptionsRowRef}  */}
-                    {CurDataDetail.replyImgUrl != null ? (
-                      <>
                     <Form.Item name="file">
                       <PictureOptionsRow
                         action="/tos/communtiy/service/reply/img"
@@ -191,10 +191,9 @@ const Detail = (props: any) => {
                           imageType: 'tosCommunityImageReply',
                           extends: '',
                         }}
+                        over={CurDataDetail.replyImgUrl.length > 0 ? true : false}
                       />
                     </Form.Item>
-                      </>
-                    ) : null}
                   </Col>
                 </Row>
                 {editorFlag ? (

src/pages/PropertyManagement/ChargeDetail.tsx

 import React, { useState, useEffect } from 'react';
 import styles from './ChargeDetail.less';
-import { Pagination, Tooltip } from 'antd';
+import { Pagination, Tooltip, Spin } from 'antd';
 
 import { useIntl, connect } from 'umi';
 
@@ -12,19 +12,39 @@ import { timestampToTime } from '../../utils/time';
 import TitleBack from '../../components/TitleBack/TitleBack';
 
 const ChargeDetail = (props: any) => {
-  const { CurData } = props;
+  const { CurData, dispatch, FileImg } = props;
 
   const [scale, setState] = useState(1.3);
   const [pages, setPages] = useState(1);
   const [curpage, setCurpage] = useState(1);
 
+  const [loading, setLoading] = useState(false);
+
   useEffect(() => {
-    console.log(CurData);
-    if (!CurData) {
+    if (CurData) {
+      dispatch({
+        type: 'Contract/RA',
+        playload: {
+          index: 47,
+          body: {
+            type: 'tosAccountPreview',
+            fileName: CurData.billName,
+            extends: CurData.communityName,
+          },
+        },
+      });
+      setLoading(true);
+    } else {
       history.back();
     }
   }, []);
 
+  useEffect(() => {
+    if (FileImg) {
+      setLoading(false);
+    }
+  }, [FileImg]);
+
   const pdfpages = (pages: any) => {
     setPages(pages);
   };
@@ -64,7 +84,7 @@ const ChargeDetail = (props: any) => {
           <div className={styles.box4}>
             <Pagination simple defaultCurrent={curpage} total={pages * 10} onChange={pageChange} />
           </div>
-          <>
+          <Spin spinning={loading}>
             <Tooltip title={scale == 1.3 ? '点击放大查看' : '还原视图'}>
               <div className={scale == 1.3 ? styles.box3out : null}>
                 <div className={scale == 1.3 ? styles.box3 : styles.box3of} onClick={lookup}>
@@ -72,7 +92,7 @@ const ChargeDetail = (props: any) => {
                     // key="pdfjs"
                     file={
                       // 'data:application/pdf;base64,' + stringSplit(CurData.billFileUrl, 'm/cash')
-                      stringSplit(CurData.billFileUrl, 'm/cash')
+                      stringSplit(CurData.billFileUrl || FileImg[0].fileUrl, 'm/cash')
                     }
                     // workerSrc="//cdnjs.cloudflare.com/ajax/libs/pdf.js/2.2.228/pdf.worker.js"
                     scale={scale}
@@ -82,7 +102,7 @@ const ChargeDetail = (props: any) => {
                 </div>
               </div>
             </Tooltip>
-          </>
+          </Spin>
         </>
       ) : null}
     </div>
@@ -91,8 +111,10 @@ const ChargeDetail = (props: any) => {
 
 function mapStateToProps(state: any) {
   const { CurData } = state.PropertyManagement;
+  const { FileImg } = state.Contract;
   return {
     CurData,
+    FileImg,
   };
 }
 export default connect(mapStateToProps)(ChargeDetail);

src/pages/UserManagement/LIFEUserManagement/ResultPageFailed.tsx

-import React, { useState, useEffect, useRef } from 'react';
-import { Input, Tabs, Table, Result, Button } from 'antd';
-const { TabPane } = Tabs;
+import React, { useState, useEffect } from 'react';
+import { Result, Button } from 'antd';
 
 import { connect, history } from 'umi';
 
-import { getCookie } from '@/utils/method';
-import { RA } from '@/utils/method';
 const module = 'User';
 const ResultPageFailed = (props: any) => {
-  const { dispatch, Data } = props;
-  const formRef = useRef(null);
-
-  const [resultTime, setResultTime] = useState(3);
+  const [resultId, setResultId] = useState(3);
 
   const backPage = () => {
     history.go(-1);
   };
+
+  useEffect(() => {
+    const id = localStorage.getItem('userInfo') || '';
+
+    setResultId(JSON.parse(id).userModel.id);
+  }, []);
   return (
     <div style={{ width: '100%', minWidth: 1020, padding: 34, backgroundColor: '#ffffff' }}>
       <Result
@@ -27,9 +27,7 @@ const ResultPageFailed = (props: any) => {
             {/* <a href={'http://47.74.233.180:8651/tos/excel/down?operator_id=' + getCookie('id')}>
               Download
             </a> */}
-            <a href={'http://192.168.1.28:8651/tos/excel/down?operator_id=' + getCookie('id')}>
-              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

src/pages/UserManagement/ServiceProviderManagement/AccoutingContent.tsx

@@ -73,7 +73,7 @@ const AccoutingContent = (props: {
     const copyStatus = document.execCommand('Copy'); // 执行copy操作
     // 对成功与否定进行提示
     if (copyStatus) {
-      message.success('Copy Success');
+      message.success('URL copy successfully!');
     } else {
       message.error('Copy Failure,Please copy manually');
     }