提交冲突

src/pages/PropertyManagement/ChargeDetail.tsx

@@ -66,7 +66,7 @@ const ChargeDetail = (props: any) => {
             <Pagination simple defaultCurrent={curpage} total={pages * 10} onChange={pageChange} />
           </div>
           <>
-            <Tooltip title={scale == 1.3 ? '点击放大查看' + CurData.billFileUrl : '还原视图'}>
+            <Tooltip title={scale == 1.3 ? '点击放大查看' : '还原视图'}>
               <div className={scale == 1.3 ? styles.box3out : null}>
                 <div className={scale == 1.3 ? styles.box3 : styles.box3of} onClick={lookup}>
                   <PDF

src/pages/UserManagement/LIFEUserManagement/UsersAdd.tsx

@@ -10,7 +10,7 @@ import SearchOptionsCommnity from '../../../components/SearchOptions/SearchOptio
 import { checkParam, RA } from '../../../utils/method'
 import { validateMessages } from '@/utils/params';
 
-import "./UsersAddInput.less"
+// import "./UsersAddInput.less"
 
 
 const module = "User"
@@ -22,8 +22,9 @@ const UsersAdd = (props: any) => {
   const formRef = useRef(null as any);
 
   const [loading, setLoading] = useState(false)
-  const onFinish = (values: any) => {
 
+  const onFinish = (values: any) => {
+    console.log(values)
     if (postman.extend != null) {
       values.communityName = postman.extend
     } else {
@@ -57,6 +58,7 @@ const UsersAdd = (props: any) => {
   }, [communityInfo])
 
   const checkData = (rule: any, value: any, callback: any) => {
+    console.log(rule, value)
     if (value) {
       if (/^[a-zA-Z0-9]+$/g.test(value)) {
         callback();
@@ -79,10 +81,10 @@ const UsersAdd = (props: any) => {
           </div>
 
           {/* <div className={styles.box4}>
-        <div className={styles.box4item0}>Contact Details</div>
-        <div className={styles.box4item1}><Form.Item name="owerPhone" ><Input placeholder="Phone Number" /></Form.Item></div>
-        <div className={styles.box4item2}><Form.Item name="owerEmail" ><Input placeholder="Email" /></Form.Item></div>
-      </div>  */}
+            <div className={styles.box4item0}>Contact Details</div>
+            <div className={styles.box4item1}><Form.Item name="owerPhone" ><Input placeholder="Phone Number" /></Form.Item></div>
+            <div className={styles.box4item2}><Form.Item name="owerEmail" ><Input placeholder="Email" /></Form.Item></div>
+          </div> */}
 
           <div className={styles.box2}>
             <div className={styles.box2item1}>Contact Details</div>

src/pages/UserManagement/LIFEUserManagement/UsersAddInput.css

-.box2item3___3VsZz .ant-form-item-explain {
+/* .box2item3___3VsZz .ant-form-item-explain {
   margin-left: -80px;
 }
 .box2item5___2AZ2K .ant-form-item-explain {
@@ -9,4 +9,4 @@
 }
 .box2item7___ePaor .ant-form-item-explain {
   margin-left: -30px;
-}
+} */

src/pages/UserManagement/ServiceProviderManagement/ServiceProviderManagement.tsx

@@ -108,22 +108,16 @@ const ServiceProviderManagement = (props: any) => {
   }, [Data])
 
   useEffect(() => {
-    //分页设置
-    // if (location.query.pageNum != null) {
-    //   setPageNum(parseInt(location.query.pageNum))
-    // } else {
 
-    // }
     setPageNum(1)
-
     setLoading(true)
-    //获取数据
     TosTosServiceProviderGet({
       ...location.query,
       serviceCommunityList: (testData === null || testData.length === 0) ? CommunityList : testData,
       pageNum: 1
     })
 
+
   }, [location])
 
   const CallBackTitleSearch = (comment: any) => {

src/pages/user/login/index.tsx

@@ -32,9 +32,6 @@ const Login: React.FC<LoginProps> = (props) => {
 
   const handleSubmit = (values: LoginParamsType) => {
     const { dispatch } = props;
-    console.log({ ...values, type, userName, password });
-    console.log(props);
-    console.log(dispatch, 'dispatch');
     dispatch({
       type: 'login/login',
       payload: { userName, password },
@@ -84,8 +81,8 @@ const Login: React.FC<LoginProps> = (props) => {
           <ArrowLeftOutlined style={{ fontSize: '28px' }} />
         </div>
       ) : (
-        <div />
-      )}
+          <div />
+        )}
       <LoginForm activeKey={type} onTabChange={setType} onSubmit={handleSubmit}>
         <div className={styles.box1}>Account Number</div>
         <input className={styles.input} onChange={usernameHandle} />
@@ -98,20 +95,20 @@ const Login: React.FC<LoginProps> = (props) => {
             </div>
           </div>
         ) : (
-          <div>
-            <input className={styles.input2} onChange={passwdHandle} type="password" />
             <div>
-              <div className={styles.input3} onClick={gotoForgetHandle}>
-                Forget Password
+              <input className={styles.input2} onChange={passwdHandle} type="password" />
+              <div>
+                <div className={styles.input3} onClick={gotoForgetHandle}>
+                  Forget Password
               </div>
-              <div className={styles.input4}>
-                {status === 'error' && loginType === 'account' && !submitting && (
-                  <div>Wrong account or password</div>
-                )}
+                <div className={styles.input4}>
+                  {status === 'error' && loginType === 'account' && !submitting && (
+                    <div>Wrong account or password</div>
+                  )}
+                </div>
               </div>
             </div>
-          </div>
-        )}
+          )}
         <Submit className={styles.button} loading={submitting} style={{ width: 330 }}>
           {forgetflag ? 'Next' : '登录'}
         </Submit>