测试问题修复

src/layouts/SecurityLayout.tsx

@@ -68,6 +68,7 @@ class SecurityLayout extends React.Component<SecurityLayoutProps, SecurityLayout
       console.log('页面加载');
       return <PageLoading />;
     }
+    console.log(window.location.pathname);
     if (!isLogin && window.location.pathname !== '/user/login') {
       message.error('Please Re Login!', 3);
       // console.log('未登录返回登录页!');

src/models/CommunityManagement/CommunityService.ts

@@ -79,7 +79,7 @@ export default {
                 address: tmp.addressAndpostalCode,
                 home: tmp.buildingNumber + '#' + tmp.floorNumber + '-' + tmp.roomNumber,
                 name: tmp.owerName,
-                phone: tmp.accountLogin != null ? tmp.accountLogin : tmp.owerPhone,
+                phone: tmp.owerPhone,
                 email: tmp.owerEmail,
                 content: resp.data.serviceContent,
                 replyContent: resp.data.replyContent,

src/models/login.ts

@@ -67,6 +67,8 @@ const Model: LoginModelType = {
         console.log(userMessage);
         console.log(userMessage.token);
         setCookie('token', userMessage.token);
+        setCookie('name', userMessage.userModel.tosUserName);
+        setCookie('phone', userMessage.userModel.tosUserPhone);
         localStorage.setItem('permission', JSON.stringify(userMessage.permission));
         console.log('获取到Token:' + getCookie('token'));
         yield put({

src/pages/CommercialService/CardAdd.tsx

@@ -103,7 +103,7 @@ const CardAdd = (props: any) => {
                 className={styles.buildNumber}
                 rules={[{ required: true, validator: checkData }]}
               >
-                <Input style={{ width: 80 }} placeholder={'Building'} />
+                <Input style={{ width: 80 }} placeholder={'BLK'} />
               </Form.Item>
               <div style={{ lineHeight: 2, marginRight: 16 }}>#</div>
               <Form.Item

src/pages/CommercialService/Detail.tsx

@@ -77,6 +77,8 @@ const Detail = (props: any) => {
         fromRef.current.setFieldsValue(tmp);
       }
       setLoading(false);
+    } else {
+      history.back();
     }
   }, [CurDataDetail]);
 
@@ -119,9 +121,7 @@ const Detail = (props: any) => {
                   {CurDataDetail.address}{' '}
                 </Descriptions.Item>
                 <Descriptions.Item label="User Name">{CurDataDetail.name}</Descriptions.Item>
-                <Descriptions.Item label="Contact Details">
-                  {CurDataDetail.phone}{' '}
-                </Descriptions.Item>
+                <Descriptions.Item label="Contact Details">{CurDataDetail.phone}</Descriptions.Item>
                 <Descriptions.Item>{CurDataDetail.email}</Descriptions.Item>
               </Descriptions>
               <Row gutter={16}>

src/pages/CommercialService/PropertyServices.tsx

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

src/pages/user/login/index.tsx

@@ -85,6 +85,7 @@ const Login: React.FC<LoginProps> = (props) => {
   const onGetCaptcha = useCallback(async (email: string) => {
     // getFakeCaptcha
     // getCaptcha
+    message.success('Has Been Sent!');
     const result = await getCaptcha({ account: email });
     console.log(result);
 
@@ -92,7 +93,7 @@ const Login: React.FC<LoginProps> = (props) => {
     if (result === false) {
       return;
     }
-    message.success('获取验证码成功！验证码为：1234');
+
     setTiming(true);
   }, []);
 
@@ -144,7 +145,7 @@ const Login: React.FC<LoginProps> = (props) => {
           </div>
         ) : (
           <div>
-            <Form.Item name="password">
+            <Form.Item name="password" initialValue={userName || ''}>
               <input className={styles.input2} type="password" />
             </Form.Item>
             <div>

src/utils/authority.ts

@@ -2,11 +2,9 @@ import { reloadAuthorized } from './Authorized';
 
 // use localStorage to store the authority info, which might be sent from server in actual project.
 export function getAuthority(str?: string): string | string[] {
-  console.log("获取权限")
   const authorityString =
     typeof str === 'undefined' && localStorage ? localStorage.getItem('antd-pro-authority') : str;
   // authorityString could be admin, "admin", ["admin"]
-  console.log(authorityString)
   let authority;
   try {
     if (authorityString) {
@@ -17,7 +15,7 @@ export function getAuthority(str?: string): string | string[] {
   }
   if (typeof authority === 'string') {
     // return [authority];
-    return  ['admin'];
+    return ['admin'];
   }
   // preview.pro.ant.design only do not use in your production.
   // preview.pro.ant.design 专用环境变量，请不要在你的项目中使用它。
@@ -26,7 +24,7 @@ export function getAuthority(str?: string): string | string[] {
     return ['admin'];
   }
   // return authority;
-  return  ['admin'];
+  return ['admin'];
 }
 
 export function setAuthority(authority: string | string[]): void {