Merge branch 'issue-20190920' into pre

src/common/Captcha/index.js

@@ -7,10 +7,10 @@ const CAPTCHAID = '6b0f5f6c8f334f3693ee754ba5692e36'
 class Captcha extends Component {
     componentDidMount() {
         const {getInstance, handleError, onVerify} = this.props
-        const el = document.getElementById('captcha')
+        const el = document.getElementById('captcha');
         el && initCaptcha(function () {
             initNECaptcha({
-                    element: '#captcha',
+                    element: el,
                     captchaId: CAPTCHAID,
                     mode: 'float',
                     width: 'auto',

src/components/classify/courselist.js

@@ -26,7 +26,8 @@ class Classify extends Component {
             allClass: [],
             data: [],
             activeTab: decodeURIComponent(getParam('name')),
-            isLoading: true
+            isLoading: true,
+            top: 44
         }
 
     }
@@ -34,6 +35,11 @@ class Classify extends Component {
     componentDidMount() {
         this.getTabs()
         this.getList()
+
+        const el = document.querySelector('.search-nav');
+        this.setState({
+            top: el.offsetHeight
+        });
     }
 
     componentWillUnmount() {
@@ -173,7 +179,7 @@ class Classify extends Component {
                                         <Sticky>
                                             {({ style }) => {
                                                 return (
-                                                    <div style={{ ...style, top: '44px', zIndex: 1 }}>
+                                                    <div style={{ ...style, top: `${this.state.top}px`, zIndex: 1 }}>
                                                         <Tabs.DefaultTabBar {...props} />
                                                     </div>
                                                 )