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

config/config.ts

@@ -71,14 +71,14 @@ export default defineConfig({
             },
             {
               path: '/',
-              redirect: '/UserManagement/LIFEUserManagement',
+              redirect: '/runTest',
+            },
+            {
+              path: '/runTest',
+              // name: 'monitoringcenter',
+              icon: 'PieChartOutlined',
+              component: './runTest/Template',
             },
-            // {
-            //   path: '/runTest',
-            //   name: 'monitoringcenter',
-            //   icon: 'PieChartOutlined',
-            //   component: './runTest/Template',
-            // },
             {
               path: '/UserManagement',
               name: 'usemanagement',

src/components/PictureOptions/PictureOptionsRow.tsx

@@ -22,7 +22,6 @@ const PictureOptionsRow = (props: any) => {
   const [previewImage, setPreviewImage] = useState('');
   const [limitNum, setLimitNum] = useState(5);
   const handleCancel = () => setPreviewVisible(false);
-
   const [imgLoad, setimgLoad] = useState(false); //图片上传 load状态
 
   useEffect(() => {
@@ -48,7 +47,7 @@ const PictureOptionsRow = (props: any) => {
           resultToInside.push(item.name);
         });
         setFileList(result);
-        onChange(resultToInside);
+        onChange && onChange(resultToInside);
       }
     }
   }, [value]);
@@ -69,7 +68,7 @@ const PictureOptionsRow = (props: any) => {
         resultToInside.push(item.name);
       });
       setFileList(result);
-      onChange(resultToInside);
+      onChange && onChange(resultToInside);
     }
     //   }
   }, [defaultValue]);
@@ -105,7 +104,7 @@ const PictureOptionsRow = (props: any) => {
       tmp.map((item: { name: string }, index: number) => {
         result.push(item.name);
       });
-      onChange(result);
+      onChange && onChange(result);
     }
   };
 
@@ -118,7 +117,7 @@ const PictureOptionsRow = (props: any) => {
       }
     }
     setFileList([...list]);
-    onChange([...list]);
+    onChange && onChange([...list]);
   };
 
   // 提交前限制

src/models/CommunityManagement/User.ts

@@ -96,9 +96,9 @@ export default {
       const resp = yield call(service.RA, playload);
       console.log('resp', resp);
       if (resp.code == 500 || resp.error_code != '0000') {
-        // message.error("Server Error,try again,error code:500",3)
+        // message.error('Server Error,try again,error code:500', 3);
         // window.location.href = '/500';
-        message.error(resp.msg);
+        // message.error(resp.msg);
       }
 
       if (resp.error_code != '0000') {
@@ -116,6 +116,7 @@ export default {
             break;
           case 13:
             {
+              // message.error('Request exception please retry!!!');
               history.push('/UserManagement/LIFEUserManagement');
             }
             break;
@@ -132,6 +133,7 @@ export default {
             }
             yield put({ type: 'returnData4Error', Data4Error });
             break;
+          case 18:
           case 53:
             {
               Result = resp;
@@ -150,7 +152,7 @@ export default {
           case 18:
           case 14:
             {
-              message.success('Success Operation!', 3);
+              message.success('Success Operation!');
               // window.location.href = '/CommunityManagement/FacilityBookings';
               history.push('/UserManagement/LIFEUserManagement');
             }

src/models/ServiceProvider.ts

@@ -44,6 +44,7 @@ export default {
         yield put({ type: 'returnPage', Data });
       } else {
         console.log('请求错误码:' + resp.error_code);
+        message.error(resp.error_msg);
         let Data = null;
         console.log(playload);
         yield put({ type: 'returnPage', Data });
@@ -112,7 +113,7 @@ export default {
       const res = yield call(service.TosGuarderDel, playload);
       console.log(res);
       if (res.error_code === '0000') {
-        message.success(res.error_msg);
+        message.success('Safer information deleted successfully!!!');
         history.go(-1);
       } else {
         message.error('Deletion failed,Please try again');

src/pages/CommercialService/Detail.tsx

@@ -223,7 +223,6 @@ const Detail = (props: any) => {
 
 function mapStateToProps(state: any) {
   const { CurDataDetail } = state.CommunityService;
-  console.log(CurDataDetail);
   return {
     CurDataDetail,
   };

src/pages/PropertyManagement/ChargeManager.tsx

@@ -70,6 +70,14 @@ const ChargeManager = (props: any) => {
       ...location.query,
     };
     get(readyData);
+
+    return () => {
+      readyData = {
+        tosOwnerName: '',
+        communityName: '',
+        pageNum: 1,
+      };
+    };
   }, [location]);
 
   // 监听数据返回

src/pages/UserManagement/LIFEUserManagement/UsersDetail.tsx

@@ -74,9 +74,10 @@ const UsersDetail = (props: any) => {
   useEffect(() => {
     if (Result != null) {
       console.log(Result);
-      if (Result.error_code == '0001') {
-        message.error(Result.error_msg, 3);
+      if (Result.error_code !== '0000') {
+        message.error(Result.error_msg);
         ResultClear();
+        history.go(0);
       }
     }
   }, [Result]);
@@ -90,6 +91,9 @@ const UsersDetail = (props: any) => {
           id: DataSave.id,
           owerName: DataSave.owerName,
           enable: DataSave.enable,
+          buildingNumber: DataSave.buildingNumber,
+          floorNumber: DataSave.floorNumber,
+          roomNumber: DataSave.roomNumber,
         });
       } else {
         message.error(returnValue.error_msg, 3);
@@ -175,7 +179,18 @@ const UsersDetail = (props: any) => {
       message.error('No Permissions!!!', 3);
       return;
     }
-    RA(39, { id: values.id, ownerId: values.owner_id });
+    confirm({
+      title: 'Are you sure delete this infomation?',
+      icon: <ExclamationCircleOutlined />,
+      content: 'Please click confirm to delete',
+      okText: 'Confirm',
+      okType: 'danger',
+      cancelText: 'Cancel',
+      onCancel() {},
+      onOk() {
+        RA(39, { id: values.id, ownerId: values.owner_id });
+      },
+    });
   };
 
   const titleBackCallBack = () => {
@@ -189,6 +204,9 @@ const UsersDetail = (props: any) => {
         id: DataSave.id,
         owerName: DataSave.owerName,
         enable: DataSave.enable,
+        buildingNumber: DataSave.buildingNumber,
+        floorNumber: DataSave.floorNumber,
+        roomNumber: DataSave.roomNumber,
       });
       MemberResultClear();
     }

src/pages/UserManagement/ServiceProviderManagement/AccoutingContent.tsx

@@ -53,15 +53,13 @@ const AccoutingContent = (props: {
   useEffect(() => {
     console.log(Result);
     if (Result !== null) {
+      dispatch({ type: 'ServiceProvider/ResultClear' });
       setLoading(false);
       if (Result) {
-        dispatch({ type: 'ServiceProvider/ResultClear' });
-        message.success('Logout successful!', 3, () => {
-          history.goBack();
-        });
+        message.success('Logout successful!');
+        history.goBack();
       } else {
-        message.error('Logout failed. Please try again!', 3);
-        dispatch({ type: 'ServiceProvider/ResultClear', playload: '' });
+        message.error('Logout failed. Please try again!');
       }
     }
   }, [Result]);
@@ -84,64 +82,68 @@ const AccoutingContent = (props: {
 
   return (
     <div className={styles.base}>
-      <Spin spinning={loading}>
-        {/* 头部组件 */}
-        <div className={styles.box}>
-          <div className={styles.item1}>Accounting information</div>
-          <button className={styles.item3} onClick={goToReturn}>
-            Back
-          </button>
-        </div>
-
-        {SaveChooseData.enable === 'Normal' ? (
-          <div className={styles.writeOff}>
-            <Button
-              icon={<PoweroffOutlined />}
-              type="primary"
-              danger
-              onClick={handleClick.bind(this, SaveChooseData.id)}
-            >
-              Write Off
-            </Button>
+      {SaveChooseData ? (
+        <Spin spinning={loading}>
+          {/* 头部组件 */}
+          <div className={styles.box}>
+            <div className={styles.item1}>Accounting information</div>
+            <button className={styles.item3} onClick={goToReturn}>
+              Back
+            </button>
+          </div>
+
+          {SaveChooseData.enable === 'Normal' ? (
+            <div className={styles.writeOff}>
+              <Button
+                icon={<PoweroffOutlined />}
+                type="primary"
+                danger
+                onClick={handleClick.bind(this, SaveChooseData.id)}
+              >
+                Write Off
+              </Button>
+            </div>
+          ) : (
+            <div />
+          )}
+
+          <div className={styles.box1}>
+            <div className={styles.box1item1}>Company Name</div>
+            <div className={styles.box1item2}>{SaveChooseData.providerName}</div>
+            <div className={styles.box1item3}>Office Address</div>
+            <div className={styles.box1item4}>{SaveChooseData.providerAddress}</div>
           </div>
-        ) : (
-          <div />
-        )}
-
-        <div className={styles.box1}>
-          <div className={styles.box1item1}>Company Name</div>
-          <div className={styles.box1item2}>{SaveChooseData.providerName}</div>
-          <div className={styles.box1item3}>Office Address</div>
-          <div className={styles.box1item4}>{SaveChooseData.providerAddress}</div>
-        </div>
-        <Line />
-        <div style={{ marginBottom: 28 }}>Service Community</div>
-        <ShowOptions list={SaveChooseData.serviceCommunityList} />
-        <div className={styles.box2}>
-          <div className={styles.box2item1}>Services Available</div>
-          <div className={styles.box2item2}>Accounting</div>
-        </div>
-
-        <div className={styles.box2}>
-          <div className={styles.box2item1}>Person In Charge</div>
-          <div className={styles.box2item2}>{SaveChooseData.contactName}</div>
-        </div>
-
-        <div className={styles.box3}>
-          <div className={styles.box3item1}>Contact Details</div>
-          <div className={styles.box3item2}>{SaveChooseData.contactPhone}</div>
-          <div className={styles.box3item3}>{SaveChooseData.contactEmail}</div>
-        </div>
-        <div className={styles.box4}>
-          <div className={styles.box3item1}>Upload the address</div>
-          <div className={styles.box3item2} id="copy">
-            http://bill.huahuico.com/
+          <Line />
+          <div style={{ marginBottom: 28 }}>Service Community</div>
+          <ShowOptions list={SaveChooseData.serviceCommunityList} />
+          <div className={styles.box2}>
+            <div className={styles.box2item1}>Services Available</div>
+            <div className={styles.box2item2}>Accounting</div>
+          </div>
+
+          <div className={styles.box2}>
+            <div className={styles.box2item1}>Person In Charge</div>
+            <div className={styles.box2item2}>{SaveChooseData.contactName}</div>
+          </div>
+
+          <div className={styles.box3}>
+            <div className={styles.box3item1}>Contact Details</div>
+            <div className={styles.box3item2}>{SaveChooseData.contactPhone}</div>
+            <div className={styles.box3item3}>{SaveChooseData.contactEmail}</div>
+          </div>
+          <div className={styles.box4}>
+            <div className={styles.box3item1}>Upload the address</div>
+            <div className={styles.box3item2} id="copy">
+              http://bill.huahuico.com/
+            </div>
+            <Button size="small" className={styles.box3item3} onClick={copy.bind(this)}>
+              复制
+            </Button>
           </div>
-          <Button size="small" className={styles.box3item3} onClick={copy.bind(this)}>
-            复制
-          </Button>
-        </div>
-      </Spin>
+        </Spin>
+      ) : (
+        <></>
+      )}
     </div>
   );
 };

src/pages/UserManagement/ServiceProviderManagement/Detail.tsx

@@ -100,14 +100,14 @@ const Detail = (props: any) => {
   useEffect(() => {
     console.log(Result);
     if (Result !== null) {
+      dispatch({ type: 'ServiceProvider/ResultClear' });
       setLoding(false);
       if (Result) {
-        dispatch({ type: 'ServiceProvider/ResultClear' });
-        message.success('Logout successful!', 2);
+        message.success('Logout successful!');
+        console.log('跳转页面');
         history.goBack();
       } else {
         message.error('Logout failed. Please try again!', 3);
-        dispatch({ type: 'ServiceProvider/ResultClear', playload: '' });
       }
     }
   }, [Result]);

src/pages/UserManagement/ServiceProviderManagement/Edit.less

@@ -53,11 +53,12 @@
 }
 .box1item3 {
   position: absolute;
-  left: 529px;
+  top: 50px;
 }
 .box1item4 {
   position: absolute;
-  left: 650px;
+  left: 154px;
+  top: 50px;
 }
 
 // 线栏
@@ -65,7 +66,7 @@
   width: 100%;
   height: 1px;
   border-top: 1px solid rgba(217, 217, 217, 1);
-  margin-top: 28px;
+  margin-top: 70px;
   margin-bottom: 28px;
 }
 

src/pages/UserManagement/ServiceProviderManagement/Edit.tsx

@@ -132,7 +132,7 @@ const Edit = (props: any) => {
                   },
                 ]}
               >
-                <Input style={{ width: 200 }} placeholder="Single Line Input" />
+                <Input style={{ width: 260 }} placeholder="Single Line Input" />
               </Form.Item>
             </div>
           </div>

src/pages/UserManagement/ServiceProviderManagement/Guard.tsx

@@ -60,7 +60,7 @@ const Guard = (props: any) => {
       <div className={styles.item1_1}>{CurDataFollowDetail.companyName}</div>
       <div className={styles.clear1}></div>
 
-      <div className={styles.item1}>Full Name</div>
+      <div className={styles.item1}>User Name</div>
       <div className={styles.item1_1}>{CurDataFollowDetail.saferName}</div>
       <div className={styles.clear1}></div>