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

src/pages/UserManagement/ServiceProviderManagement/Guard.tsx

@@ -11,10 +11,16 @@ import TitleGet from '../../../components/TitleGet/TitleGet';
 import { timestampToTime } from '../../../utils/time';
 
 const Guard = (props: any) => {
-  const { CurDataFollowDetail, dispatch } = props;
+  const { CurDataFollowDetail, dispatch, history } = props;
 
   console.log(CurDataFollowDetail);
 
+  useEffect(() => {
+    if (!CurDataFollowDetail) {
+      history.goBack();
+    }
+  }, []);
+
   // 删除保安
   const handleClickBtn = (id: string) => {
     confirm({
@@ -33,7 +39,7 @@ const Guard = (props: any) => {
     });
   };
 
-  return (
+  return CurDataFollowDetail ? (
     <div className={styles.base}>
       <div className={styles.item0}>
         <TitleGet title={'Edit Security Guard Account'} />
@@ -70,6 +76,8 @@ const Guard = (props: any) => {
 
       <Button onClick={handleClickBtn.bind(this, CurDataFollowDetail.id)}>Cancellation</Button>
     </div>
+  ) : (
+    <></>
   );
 };
 

src/pages/UserManagement/ServiceProviderManagement/ServiceProviderManagement.tsx

@@ -62,7 +62,7 @@ const ServiceProviderManagement = (props: propsType) => {
 
     SaveChooseData(values);
 
-    if (values.serviceScope === 'Accountant') {
+    if (values.serviceScope === 'Accounting Service') {
       history.push(location.pathname + '/AccoutingDetail');
     } else {
       history.push(location.pathname + '/Detail');

src/pages/user/login/index.tsx

@@ -27,9 +27,11 @@ const Login: React.FC<LoginProps> = (props) => {
   const handleSubmit = async (values: LoginParamsType) => {
     console.log(values);
     if (forgetflag) {
+      if (!values.userName || !values.code) {
+        message.error('The mailbox or verification code cannot be empty!!!');
+        return;
+      }
       console.log('校验验证码！');
-      console.log(userName);
-      console.log(values);
       const res = await ValidateCaptcha({ account: values.userName, code: values.code });
       console.log(res);