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

src/components/TableShow/TableShow.tsx

@@ -84,7 +84,7 @@ const TableShow = (props: any) => {
                 <Col>Address:</Col>
                 <Col>
                   {item.owner.buildingNumber +
-                    '#' +
+                    ' #' +
                     item.owner.floorNumber +
                     '-' +
                     item.owner.roomNumber +
@@ -170,8 +170,6 @@ export default TableShow;
 // ower_phone: "微微"
 // room_number: "399"
 
-{
-  /* <div style={{ width: 80, height: 80, border: "1px solid #cccccc",padding:8,lineHeight:1,textAlign:"center",fontSize:12}}>
+/* <div style={{ width: 80, height: 80, border: "1px solid #cccccc",padding:8,lineHeight:1,textAlign:"center",fontSize:12}}>
 Activation Code Has Been Used/Is Inactive
 </div> */
-}

src/pages/UserManagement/LIFEUserManagement/Users.tsx

@@ -69,7 +69,7 @@ const Users = (props: any) => {
     {
       title: unit,
       render: (text: any, record: any) => (
-        <div>{record.buildingNumber + '#' + record.floorNumber + '—' + record.roomNumber}</div>
+        <div>{record.buildingNumber + ' #' + record.floorNumber + '—' + record.roomNumber}</div>
       ),
     },
     {

src/pages/UserManagement/LIFEUserManagement/UsersAdd.tsx

 import React, { useState, useEffect, useRef } from 'react';
-import styles from './UsersAdd.less';
 import { Input, Spin, Button, Form, message } from 'antd';
 
 import { connect } from 'umi';
+import styles from './UsersAdd.less';
 
 import Line from '../../../components/Line/Line';
 import TitleBack from '../../../components/TitleBack/TitleBack';
@@ -28,7 +28,7 @@ const UsersAdd = (props: any) => {
     if (checkParam(values)) {
       values.owerPhone = null;
       values.owerEmail = null;
-      values.buildingNumber = 'BLK ' + values.buildingNumber + ' ';
+      values.buildingNumber = 'BLK ' + values.buildingNumber;
       RA(14, values, module, dispatch);
       setLoading(true);
     } else {

src/pages/UserManagement/LIFEUserManagement/UsersDetail.tsx

@@ -57,7 +57,7 @@ const UsersDetail = (props: any) => {
     [1, 'Family Member'],
     [2, 'Tenant'],
   ];
-  const user_type_status = ['Unregistered', 'registered', 'Deregistered'];
+  const user_type_status = ['Unregistered', 'Registered', 'Deregistered'];
 
   const [DataSaveLoading, setDataSaveLoading] = useState(false);
 
@@ -200,7 +200,7 @@ const UsersDetail = (props: any) => {
 
   const checkData = (rule: any, value: any, callback: any) => {
     if (value) {
-      if (/^1\d{7}|1[3|5|7|8]\d{9}$/g.test(value)) {
+      if (/^\d{8}|1[3|5|7|8]\d{9}$/g.test(value)) {
         callback();
       } else {
         callback(new Error('Incorrect format of mobile phone number!'));