Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

src/assets/css/custom.css

@@ -775,10 +775,9 @@ background-size: 75% auto;
 .user-search-link button{font-size:0.875rem;margin-top:20px}
 
 
-/* 지도 안에 버튼들 관리 */
-.search-comp{position:relative; z-index:100;display:flex;}
+/* 지도 검색 */
+.search-comp{position:relative; z-index:100;}
 .search-feather{padding-top:10px;margin-left:10px;width:400px;}
-
 .search-result-comp{margin:0 0 0 10px;background-color:#fff;}
 .search-result{padding:10px 0 5px 10px;}
 .search-result:hover{background-color:#e7e7e7}

src/components/account/mypage/AccountMypageForm.js

@@ -122,10 +122,31 @@ const AccountMypageForm = ({ userInfo,handlerSmsSend,isCrtfy,seconds_Counter,han
                                     <Row className='input-inline-btn'>
                                       <Col md='8'>
                                         <Label className='form-label' for='crtfyNo'>인증번호</Label>
-                                        <Input type='number' name='crtfyhpNo' id='crtfyhpNo' bsSize='sm' value={inputCrtfy} onChange={handlerChange}  />
+                                        <Input
+                                          type='number'
+                                          name='crtfyhpNo'
+                                          id='crtfyhpNo'
+                                          bsSize='sm'
+                                          value={inputCrtfy}
+                                          onChange={handlerChange}
+                                          {...isRunning ?
+                                            {}
+                                          :
+                                            {disabled:true}
+                                          }
+                                        />
                                       </Col>
                                       <Col md='4' xs='12'>
-                                        <Button.Ripple type='button' color='secondary' onClick={handlerSmsConfirm}>
+                                        <Button.Ripple
+                                          type='button'
+                                          color='secondary'
+                                          onClick={handlerSmsConfirm}
+                                          {...isRunning ?
+                                            {}
+                                          :
+                                            {disabled:true}
+                                          }
+                                        >
                                           <span className='d-sm-inline-block'>인증하기</span>
                                         </Button.Ripple>
                                       </Col>

src/components/basis/flight/plan/FlightPlanAreaMap.js

@@ -217,7 +217,7 @@ const FlightPlanAreaMap = props => {
               />
             ) : null}
 
-            <div className='search-comp'>
+            <div className='d-flex search-comp'>
               <div className=''>
                 <InputGroup className='search-feather'>
                   <InputGroupAddon addonType='prepend'>

src/containers/account/mypage/AccountMypageContainer.js

@@ -36,14 +36,16 @@ const AccountMypageContainer = () => {
 
     const [inputHpno, setInputHpno] = useState('');
     const [inputCrtfy, setInputCrtfy] = useState('');
-    const [okinput, setOkinput] = useState(false)
-    const [okcheck, setOkcheck] = useState('');
-    const [isRunning, setIsRunning] = useState(false);
-    const [sendCount, setSendCount] = useState(0);
-    const [isCrtfy, setIsCrtfy] = useState(false);
+    
     const [minutes_Counter, setMinutes_Counter] = useState('03');
     const [seconds_Counter, setSeconds_Counter] = useState('00');
     const [timer, setTimer] = useState(null);
+    const [isRunning, setIsRunning] = useState(false);
+    const [sendCount, setSendCount] = useState(0);
+    const [isCrtfy, setIsCrtfy] = useState(false);
+
+    const [okinput, setOkinput] = useState(false)
+    const [okcheck, setOkcheck] = useState('');
     
     const [modal, setModal] = useState({
         isOpen: false,
@@ -164,14 +166,13 @@ const AccountMypageContainer = () => {
     };
 
     useEffect(() => {
-        setIsRunning(true);
-        // console.log('isRunning>>>', isRunning);
+        // setIsRunning(true);
         if (isRunning) {
             clearInterval(timer);
         }
         return () => {
             clearInterval(timer);
-            setIsRunning(false);
+            // setIsRunning(false);
         };
     }, []);
 
@@ -179,7 +180,7 @@ const AccountMypageContainer = () => {
     const handlerSmsConfirm = async () => {
         //const vData = getValues();
 
-        if (!inputCrtfy || !inputHpno) {
+        if (!inputHpno) {
             setModal({
                 isOpen: true,
                 title: '인증번호 인증',