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

src/components/PictureOptions/PictureOptionsRow.tsx

@@ -113,7 +113,7 @@ const PictureOptionsRow = (props: any) => {
     }
     const isLt2M = file.size / 1024 / 1024 < 2;
     if (!isLt2M) {
-      message.error('Image must smaller than 2MB!');
+      message.error('Image must be less than or equal to 2MB!');
     }
     return isJpgOrPng && isLt2M;
   }

src/components/TableShow/TableShow.tsx

@@ -35,6 +35,7 @@ const TableShow = (props: any) => {
   const user_type_status = ['Normal', 'Normal', 'Cancellation'];
 
   const user_code = ['Activation Code Is Inactive', 'Activation Code Has Been Used'];
+
   const key = objectColumns([
     ['User Name', 'owner_family_name'],
     ['Contact Details', 'owner_family_phone'],

src/pages/CommercialService/Card.tsx

@@ -30,6 +30,13 @@ const Card = (props: any) => {
     [2, 'Reject'],
     [3, 'Received'],
   ];
+
+  const apply_relation = [
+    [0, 'Oneself'],
+    [1, 'Family Members'],
+    [2, 'Tenant'],
+  ];
+
   const columns = objectColumns([
     ['Community Name', 'community_name'],
     [
@@ -41,16 +48,21 @@ const Card = (props: any) => {
         </Space>
       ),
     ],
-    ['Community Owner', 'community_owner'],
+    ['User Name', 'apply_name'],
+    [
+      'Account Type',
+      'apply_relation_owner',
+      (text: string, record: any) => <div>{apply_relation[text][1]}</div>,
+    ],
     [
-      'Apply Time',
+      'Application Time',
       null,
       (text: any, record: any) => (
         <Space size="middle">{timestampToTime(record.create_time.time)}</Space>
       ),
     ],
     [
-      'Apply Status',
+      'Status',
       'apply_status',
       (text: any, record: any) => <Space size="middle">{apply_status[parseInt(text)][1]}</Space>,
     ],

src/pages/CommercialService/PropertyServices.tsx

@@ -68,10 +68,10 @@ const PropertyServices = (props: any) => {
       ),
     },
     {
-      title: 'Handle Status',
+      title: 'Status',
       dataIndex: 'id',
       render: (text: any, record: any) => (
-        <Space size="middle"> {handle_Status[record.handle_status][1]}</Space>
+        <Space size="middle">{handle_Status[record.handle_status][1]}</Space>
       ),
     },
     {

src/pages/CommercialService/Renovation.tsx

@@ -41,7 +41,7 @@ const Renovation = (props: any) => {
       ),
     ],
     ['Content', 'decorationContent', (text: any) => <div>{stringTab(text)}</div>],
-    ['Request Time', 'createTime', (text: any) => <div>{timestampToTime(text.time)}</div>],
+    ['Application Time', 'createTime', (text: any) => <div>{timestampToTime(text.time)}</div>],
     [
       'status',
       'decorationStatus',