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

src/pages/UserManagement/LIFEUserManagement/Users.tsx

@@ -136,20 +136,37 @@ const Users = (props: any) => {
     showUploadList: false,
   };
 
+  // 请求拿取数据
+  const getList = (CommunityList1: []) => {
+    if (readyData.communityArray.length === 0) {
+      readyData.communityArray = CommunityList1;
+    }
+    setLoading(true);
+    // 获取数据
+    RA(
+      12,
+      {
+        ...readyData,
+      },
+      module,
+      dispatch,
+    );
+  };
+
   // 监听路由变化更新数据
   useEffect(() => {
+    if (JSON.stringify(location.query) !== '{}') {
+      readyData = {
+        ...readyData,
+        ...location.query,
+      };
+    } else {
       // 重置数据
       readyData = {
         pageNum: 1,
         owerName: '',
         communityArray: [],
       };
-
-    if (location.query) {
-      readyData = {
-        ...readyData,
-        ...location.query,
-      };
     }
 
     if (CommunityList && flag === false) {
@@ -167,23 +184,6 @@ const Users = (props: any) => {
     }
   }, [CommunityList]);
 
-  // 请求拿取数据
-  const getList = (CommunityList: []) => {
-    if (readyData.communityArray.length === 0) {
-      readyData.communityArray = CommunityList;
-    }
-    setLoading(true);
-    // 获取数据
-    RA(
-      12,
-      {
-        ...readyData,
-      },
-      module,
-      dispatch,
-    );
-  };
-
   // 判断数据是否回来
   useEffect(() => {
     if (Data != null) {
@@ -258,7 +258,7 @@ const Users = (props: any) => {
 
       {/* 内容组件 */}
       <div className={styles.box2}>
-        <button className={styles.buttonAdd2} onClick={goToAdd}>
+        <button type="button" className={styles.buttonAdd2} onClick={goToAdd}>
           Create New Owner
         </button>
         <div className={styles.buttonAdd}>

src/pages/UserManagement/ServiceProviderManagement/ServiceProviderManagement.tsx

@@ -160,6 +160,12 @@ const ServiceProviderManagement = (props: propsType) => {
 
   // 监听路由url
   useEffect(() => {
+    if (JSON.stringify(location.query) !== '{}') {
+      readyData = {
+        ...readyData,
+        ...location.query,
+      };
+    } else {
       // 重置数据
       readyData = {
         pageNum: 1,
@@ -167,13 +173,8 @@ const ServiceProviderManagement = (props: propsType) => {
         serviceScope: '',
         providerName: '',
       };
-
-    if (location.query) {
-      readyData = {
-        ...readyData,
-        ...location.query,
-      };
     }
+
     if (CommunityList && flag === false) {
       flag = true;
       setLoading(true);
@@ -268,17 +269,17 @@ const ServiceProviderManagement = (props: propsType) => {
 
       {/* 内容组件 */}
       <div className={styles.box2}>
-        <button className={styles.buttonAdd2} onClick={goToServices}>
+        <button type="button" className={styles.buttonAdd2} onClick={goToServices}>
           Services Available
         </button>
-        <button className={styles.buttonAdd} onClick={goToCreate}>
+        <button type="button" className={styles.buttonAdd} onClick={goToCreate}>
           Create New
         </button>
       </div>
 
       {/* 列表组件 */}
       <Table
-        rowKey={'id'}
+        rowKey="id"
         style={{ marginTop: 16 }}
         loading={loading}
         columns={columns}