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

src/models/CommunityManagement/CommunityService.ts

@@ -92,6 +92,7 @@ export default {
             }
             break;
           case 33:
+          case 34:
           case 22:
             {
               message.success('Success Operation!', 3);

src/pages/CommercialService/Renovation.tsx

@@ -22,32 +22,35 @@ const Renovation = (props: any) => {
     [2, 'Rejected'],
   ];
 
+  const { dispatch, Data8, location } = props;
   const [loading, setLoading] = useState(false);
   const [readyData, setReadyData] = useState(null);
 
+  console.log(Data8);
+
   const columns = objectColumns([
-    ['Community', 'community_name'],
-    ['Applicant', 'applyfor_name'],
+    ['Community', 'communityName'],
+    ['Applicant', 'applyforName'],
     [
       'Unit',
       null,
       (text: any, record: any) => (
         <div>
-          {record.community_build_decorate}#{record.community_floor_decorate}-
-          {record.community_room_decoate}
+          {record.communityBuildDecorate}#{record.communityFloorDecorate}-
+          {record.communityRoomDecoate}
         </div>
       ),
     ],
-    ['Content', 'decoration_content', (text: any) => <div>{stringTab(text)}</div>],
-    ['Request Time', 'create_time', (text: any) => <div>{timestampToTime(text.time)}</div>],
+    ['Content', 'decorationContent', (text: any) => <div>{stringTab(text)}</div>],
+    ['Request Time', 'createTime', (text: any) => <div>{timestampToTime(text.time)}</div>],
     [
       'status',
-      'decoration_status',
+      'decorationStatus',
       (text: any) => <div>{decoration_status[parseInt(text)][1]}</div>,
     ],
     [
       'Actions',
-      'decoration_status',
+      'decorationStatus',
       (text: any, record: any) => (
         <Space size="middle">
           {' '}
@@ -56,8 +59,6 @@ const Renovation = (props: any) => {
       ),
     ],
   ]);
-
-  const { dispatch, Data8, location } = props;
   useEffect(() => {
     pageNum = 1;
     //分页设置

src/pages/CommercialService/RenovationDetail.tsx

@@ -27,6 +27,7 @@ const RenovationDetail = (props: any) => {
     if (!DataSave) {
       history.go(-1);
     }
+    console.log(DataSave);
   }, []);
 
   const onFinish = (values: any) => {
@@ -50,8 +51,7 @@ const RenovationDetail = (props: any) => {
     };
 
     RA(33, tmp, module, dispatch);
-    message.success('Success Operation!');
-    history.push('/CommercialService/RenovationApplication');
+    setLoading(true);
   };
 
   return (
@@ -61,45 +61,45 @@ const RenovationDetail = (props: any) => {
           <>
             <TitleBack
               sublist={[
-                'Status : ' + decoration_status[DataSave.decoration_status][1],
-                'Time : ' + timestampToTime(DataSave.create_time.time),
+                'Status : ' + decoration_status[DataSave.decorationStatus][1],
+                'Time : ' + timestampToTime(DataSave.createTime.time),
               ]}
-              title={'Renovation Detail'}
+              title={DataSave.decorationStatus === 0 ? 'Renovation Reply' : 'Renovation Detail'}
             ></TitleBack>
 
             <Row gutter={8}>
               <Col>Community:</Col>
-              <Col span={3}>{DataSave.community_name}</Col>
-              <Col>unit:</Col>
+              <Col span={3}>{DataSave.communityName}</Col>
+              <Col>Unit:</Col>
               <Col>
-                {DataSave.community_build_decorate}#{DataSave.community_floor_decorate}-
-                {DataSave.community_room_decoate}
+                {DataSave.communityBuildDecorate}#{DataSave.communityFloorDecorate}-
+                {DataSave.communityRoomDecoate}
               </Col>
             </Row>
 
             <Row gutter={8} style={{ marginTop: 16 }}>
               <Col>Address:</Col>
-              <Col>{DataSave.ownerAddress}</Col>
+              <Col>{DataSave.tosCommunityModel.residentialAddress}</Col>
             </Row>
 
             <Row gutter={8} style={{ marginTop: 16 }}>
               <Col>Owner Name:</Col>
-              <Col span={3}>{DataSave.applyfor_name}</Col>
+              <Col span={3}>{DataSave.applyforName}</Col>
               <Col>Phone:</Col>
-              <Col>{DataSave.applyfor_phone}</Col>
+              <Col>{DataSave.contactPhone}</Col>
             </Row>
 
             <Line></Line>
             <Row gutter={8} style={{ marginTop: 16 }}>
               <Col span={3}>Contract Name:</Col>
-              <Col span={3}>{DataSave.contact_name}</Col>
-              <Col>Phone:</Col>
-              <Col>{DataSave.contact_phone}</Col>
+              <Col span={3}>{DataSave.contactName}</Col>
+              <Col span={3}>Phone:</Col>
+              <Col>{DataSave.contactPhone}</Col>
             </Row>
             <Row gutter={8} style={{ marginTop: 16 }}>
               <Col span={3}>Time:</Col>
-              <Col span={3}>{timestampToTime(DataSave.decorationBegin_time.time)}</Col>
-              <Col>{timestampToTime(DataSave.decorationEnd_time.time)}</Col>
+              <Col span={3}>{timestampToTime(DataSave.decorationBeginTime)}</Col>
+              <Col>{timestampToTime(DataSave.decorationEndTime)}</Col>
             </Row>
             <Row gutter={8} style={{ marginTop: 16 }}>
               <Col span={3}>Reason:</Col>
@@ -107,14 +107,14 @@ const RenovationDetail = (props: any) => {
                 <TextArea
                   autoSize
                   disabled
-                  value={DataSave.decoration_content}
+                  value={DataSave.decorationContent}
                   style={{ width: 300, minHeight: 100, padding: 8, resize: 'none' }}
                 ></TextArea>
               </Col>
             </Row>
             <Line></Line>
 
-            {DataSave.decoration_status === 0 ? (
+            {DataSave.decorationStatus === '0' ? (
               <>
                 <Form ref={formRef} name="basic" onFinish={onFinish}>
                   <Row gutter={8} style={{ marginTop: 16 }}>
@@ -153,17 +153,17 @@ const RenovationDetail = (props: any) => {
               <>
                 <Row>
                   <Col span={3}>replier:</Col>
-                  <Col span={3}>{DataSave.reply_name}</Col>
-                  <Col>Phone: </Col>
-                  <Col>{DataSave.reply_phone}</Col>
+                  <Col span={3}>{DataSave.replyName}</Col>
+                  <Col span={3}>Phone: </Col>
+                  <Col>{DataSave.replyPhone}</Col>
                 </Row>
 
                 <Row gutter={8} style={{ marginTop: 16 }}>
                   <Col span={3}>Approval For Application:</Col>
                   <Col>
-                    <Radio.Group value={DataSave.decoration_status}>
-                      <Radio.Button value={1}>Agree</Radio.Button>{' '}
-                      <Radio.Button style={{ marginLeft: 10 }} value={2}>
+                    <Radio.Group value={DataSave.decorationStatus}>
+                      <Radio.Button value={'1'}>Agree</Radio.Button>{' '}
+                      <Radio.Button style={{ marginLeft: 10 }} value={'2'}>
                         Reject
                       </Radio.Button>
                     </Radio.Group>
@@ -176,7 +176,7 @@ const RenovationDetail = (props: any) => {
                     <TextArea
                       style={{ width: 300, minHeight: 100, padding: 8, resize: 'none' }}
                       disabled
-                      value={DataSave.reply_view}
+                      value={DataSave.replyView}
                     ></TextArea>
                   </Col>
                 </Row>

src/pages/user/login/index.tsx

@@ -24,14 +24,20 @@ const Login: React.FC<LoginProps> = (props) => {
   const [timing, setTiming] = useState(false);
 
   // 提交按钮
-  const handleSubmit = (values: LoginParamsType) => {
+  const handleSubmit = async (values: LoginParamsType) => {
     console.log(values);
     if (forgetflag) {
       console.log('校验验证码！');
-      // ValidateCaptcha({account,code})
-      if (true) {
+      console.log(userName);
+      console.log(values);
+      const res = await ValidateCaptcha({ account: values.userName, code: values.code });
+      console.log(res);
+
+      if (res.error_code === '0000') {
         console.log('通过跳转到修改密码页面');
         history.push('login2');
+      } else {
+        message.error('membercode!');
       }
     } else {
       if (values.userName && values.password) {
@@ -85,16 +91,12 @@ const Login: React.FC<LoginProps> = (props) => {
   const onGetCaptcha = useCallback(async (email: string) => {
     // getFakeCaptcha
     // getCaptcha
-    message.success('Has Been Sent!');
+    setTiming(true);
     const result = await getCaptcha({ account: email });
     console.log(result);
-
-    return;
-    if (result === false) {
-      return;
+    if (result.error_code === '0000') {
+      message.success('Has Been Sent!');
     }
-
-    setTiming(true);
   }, []);
 
   useEffect(() => {
@@ -138,14 +140,16 @@ const Login: React.FC<LoginProps> = (props) => {
         </div>
         {forgetflag ? (
           <div className={styles.box2}>
-            <input className={styles.input5} />
+            <Form.Item name="code" initialValue="">
+              <input className={styles.input5} />
+            </Form.Item>
             <div className={styles.button2} style={{ float: 'right' }} onClick={handleSend}>
               {timing ? `${count} 秒` : 'Send'}
             </div>
           </div>
         ) : (
           <div>
-            <Form.Item name="password" initialValue={userName || ''}>
+            <Form.Item name="password" initialValue="">
               <input className={styles.input2} type="password" />
             </Form.Item>
             <div>

src/pages/user/login/login2.tsx

@@ -3,7 +3,7 @@ import { message, Form, Input, Button } from 'antd';
 import styles from './style.less';
 
 interface Password {
-  password: stirng;
+  password: string;
 }
 
 const Login2 = (props: any) => {

src/services/login.ts

@@ -3,6 +3,7 @@ import request from '@/utils/request';
 export interface LoginParamsType {
   userName: string;
   password: string;
+  code: string;
 }
 export interface CodeType {
   account: string;