Merge branch 'feature/2.19.1.2501.01-验证码验证' into release/3.0.1.2504.01-合并业务线

pc4mobx/hrmSalary/components/captchaModal/index.js

@@ -31,13 +31,7 @@ class Index extends Component {
 
   componentWillUnmount() {
     clearInterval(this.timeRef);
-  }
-
-  componentWillReceiveProps(nextProps, nextContext) {
-    if (nextProps.visible !== this.props.visible && !nextProps.visible) {
-      clearInterval(this.timeRef);
-      this.setState({ captcha: "", time: 60 });
-    }
+    this.setState({ captcha: "", time: 60 });
   }
 
   handleSendCaptcha = () => {

pc4mobx/hrmSalary/pages/mobilePayroll/index.js

@@ -153,14 +153,17 @@ export default class MobilePayroll extends React.Component {
       {pwdSetVisible && <SecondarypwdVerify {...this.props} salaryBillToken={this.state.salaryBillToken}
                                             onSuccess={() => this.setState({ pwdSetVisible: false }, () => this.initMobile())}/>}
       {/*发送验证码*/}
-      <CaptchaModal
-        visible={captchaVisible} id={getQueryString("id")}
-        onCancel={() => this.setState({ captchaVisible: false })}
-        onConfirm={() => {
-          setInitEmVerify();
-          this.getMySalaryBill(getQueryString("id"));
-        }}
-      />
+      {
+        captchaVisible &&
+        <CaptchaModal
+          visible={captchaVisible} id={getQueryString("id")}
+          onCancel={() => this.setState({ captchaVisible: false })}
+          onConfirm={() => {
+            setInitEmVerify();
+            this.getMySalaryBill(getQueryString("id"));
+          }}
+        />
+      }
     </React.Fragment>;
     const {
       salaryTemplate, salaryGroups, employeeInformation, sendTime, confirmStatus, showAck, showFeedback