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

src/pages/UserManagement/LIFEUserManagement/ResultPage.tsx

@@ -5,25 +5,31 @@ import { connect, history } from 'umi';
 const module = 'User';
 const ResultPage = () => {
   const [resultTime, setResultTime] = useState(3);
-
+  let timer: NodeJS.Timeout;
   function loop(i: number) {
-    if (i < 4) {
-      console.log(i);
-
-      setResultTime(4 - i);
-      setTimeout(function () {
-        loop(++i);
-      }, 1000);
-    } else {
-      setResultTime(0);
+    setResultTime(i);
+    timer = setInterval(() => {
+      if (i <= 0) {
+        clearInterval(timer);
         history.go(-1);
+        return;
       }
+      setResultTime(--i);
+    }, 1000);
   }
 
   useEffect(() => {
-    loop(1);
+    loop(3);
+
+    return () => {
+      clearInterval(timer);
+    };
   }, []);
-  const backPage = () => {};
+
+  const backPage = () => {
+    clearTimeout(timer);
+    history.go(-1);
+  };
   return (
     <div style={{ width: '100%', minWidth: 1020, padding: 34, backgroundColor: '#ffffff' }}>
       <Result
@@ -36,9 +42,9 @@ const ResultPage = () => {
           </p>
         }
         extra={[
-          <Button type="primary" key="ok" onClick={backPage}>
-            Ok
-          </Button>,
+          // <Button type="primary" key="ok" onClick={backPage}>
+          //   Ok
+          // </Button>,
           <Button key="back" onClick={backPage}>
             Back
           </Button>,

src/pages/UserManagement/ServiceProviderManagement/ServiceProviderManagement.tsx

@@ -254,13 +254,14 @@ const ServiceProviderManagement = (props: propsType) => {
           {
             name: ['status', 'Services Available'],
             data: [...options],
+            default: readyData.serviceScope || undefined,
           },
         ]}
         community="serviceCommunityList"
         onSubmit={CallBackTitleSearch}
         defaultValue={{
           providerName: readyData.providerName,
-          // status:,
+          // status: readyData.serviceScope,
         }}
         checklist={
           readyData.serviceCommunityList.length !== 0 ? readyData.serviceCommunityList : null