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

src/components/PictureOptions/PictureOptionsRow.tsx

@@ -115,7 +115,7 @@ const PictureOptionsRow = (props: any) => {
     }
     return isJpgOrPng && isLt2M;
   }
-
+  console.log(props);
   return (
     <div>
       <Upload

src/components/TableShow/TableShow.tsx

@@ -38,7 +38,7 @@ const TableShow = (props: any) => {
 
   const key = objectColumns([
     ['User Name', 'owner_family_name'],
-    ['Contact Details', 'owner_family_phone', (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',

src/pages/CommercialService/Detail.tsx

@@ -112,8 +112,10 @@ const Detail = (props: any) => {
                 <Descriptions.Item label="Address" span={3}>
                   {CurDataDetail.address}{' '}
                 </Descriptions.Item>
-                <Descriptions.Item label="User Name" span={3}>{CurDataDetail.name}</Descriptions.Item>
-                <Descriptions.Item label="Contact Details" >{CurDataDetail.phone}</Descriptions.Item>
+                <Descriptions.Item label="User Name" span={3}>
+                  {CurDataDetail.name}
+                </Descriptions.Item>
+                <Descriptions.Item label="Contact Details">{CurDataDetail.phone}</Descriptions.Item>
                 <Descriptions.Item>{CurDataDetail.email}</Descriptions.Item>
               </Descriptions>
               <Row gutter={16}>
@@ -131,19 +133,17 @@ const Detail = (props: any) => {
                 <Col span={3}>Picture:</Col>
                 <Col>
                   {CurDataDetail != null ? (
-
                     <PictureOptionsRow
                       action="/tos/communtiy/service/reply/img"
                       disabled={true}
-                      // defaultValue={v.url}
                       value={CurDataDetail.pictrues}
                       data={{
                         userToken: 'token',
                         imageType: 'tosCommunityImageReply',
                         extends: '',
                       }}
+                      over={true}
                     />
-
                   ) : null}
                 </Col>
               </Row>
@@ -217,8 +217,8 @@ const Detail = (props: any) => {
           </Spin>
         </>
       ) : (
-          <></>
-        )}
+        <></>
+      )}
     </div>
   );
 };

src/pages/CommercialService/PropertyServices.tsx

@@ -53,7 +53,7 @@ const PropertyServices = (props: any) => {
     { title: 'Requestor', dataIndex: 'owner_name' },
 
     {
-      title: parseInt(serviceTypeGobal) - 1 === 0 ? 'Attended By' : 'Content',
+      title: parseInt(serviceTypeGobal) - 1 === 0 ? 'Attended By' : 'Description',
       dataIndex: parseInt(serviceTypeGobal) - 1 === 0 ? 'handle_name' : 'service_content',
       ellipsis: true,
       // width: 400,
@@ -93,13 +93,13 @@ const PropertyServices = (props: any) => {
     //页面递进
     history.push(
       location.pathname +
-      (value == 0 ? '/Edit' : '/Detail') +
-      urlEncode({
-        serviceType: serviceTypeGobal,
-        id: record.id,
-        user_id: record.user_id,
-        community_id: record.community_id,
-      }),
+        (value == 0 ? '/Edit' : '/Detail') +
+        urlEncode({
+          serviceType: serviceTypeGobal,
+          id: record.id,
+          user_id: record.user_id,
+          community_id: record.community_id,
+        }),
     );
   };
 

src/pages/PropertyManagement/ChargeManager.tsx

@@ -157,7 +157,7 @@ const ChargeManager = (props: any) => {
         ),
     );
   };
-
+  console.log(Data);
   return (
     <div className={styles.base}>
       <TitleSearch
@@ -170,6 +170,7 @@ const ChargeManager = (props: any) => {
 
       {Data !== null ? (
         <ProTable<GithubIssueItem>
+          columnEmptyText={false}
           columns={columns}
           dataSource={Data.list}
           rowKey={'id'}

src/pages/UserManagement/LIFEUserManagement/ResultPageFailed.tsx

@@ -6,25 +6,34 @@ import { connect, history } from 'umi';
 
 import { getCookie } from '@/utils/method';
 import { RA } from '@/utils/method';
-const module = "User"
+const module = 'User';
 const ResultPageFailed = (props: any) => {
-
   const { dispatch, Data } = props;
-  const formRef = useRef(null)
+  const formRef = useRef(null);
 
   const [resultTime, setResultTime] = useState(3);
 
   const backPage = () => {
-    history.go(-1)
-  }
+    history.go(-1);
+  };
   return (
-    <div style={{ width: "100%", minWidth: 1020, padding: 34, backgroundColor: "#ffffff" }}>
+    <div style={{ width: '100%', minWidth: 1020, padding: 34, backgroundColor: '#ffffff' }}>
       <Result
         status="error"
         title="Error submit the file!"
         subTitle={<p>server has been handled it ,please try again or back.</p>}
         extra={[
-          <Button type="primary" key="ok" ><a href={"http://47.74.233.180:8651/tos/excel/down?operator_id=" + getCookie("id")}>Download</a></Button>, <Button key="back" onClick={backPage}>Back</Button>
+          <Button type="primary" key="ok">
+            {/* <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>
+          </Button>,
+          <Button key="back" onClick={backPage}>
+            Back
+          </Button>,
         ]}
       />
     </div>
@@ -32,7 +41,7 @@ const ResultPageFailed = (props: any) => {
 };
 
 function map(state: any) {
-  const { Data } = state[module]
-  return { Data }
+  const { Data } = state[module];
+  return { Data };
 }
 export default connect(map)(ResultPageFailed);

src/pages/UserManagement/LIFEUserManagement/UsersDetail.tsx

@@ -370,7 +370,7 @@ const UsersDetail = (props: any) => {
                   <Col span={4}>{memberData.owner_family_name}</Col>
                 </Row>
                 <Row gutter={16}>
-                  <Col span={4}>Contact Detail：</Col>
+                  <Col span={4}>Contact Number：</Col>
                   <Col span={4}>{memberData.owner_family_phone}</Col>
                   <Col span={4}>{memberData.owner_family_email}</Col>
                 </Row>