Merge branch 'limit-free' into dev

# Conflicts:
#	src/components/limit-free/index.js

src/components/limit-free/index.js

@@ -25,10 +25,6 @@ class LimitFree extends Component {
   }
 
   componentDidMount() {
-    const {user, history} = this.props
-    if (user.hasError) {
-      history.push('/passport')
-    }
     this.getData()
   }
 
@@ -71,6 +67,11 @@ class LimitFree extends Component {
   }
 
   getCourse = (courseId, vCourseId) => {
+    const {user, history} = this.props
+    if (user.hasError) {
+      history.push('/passport')
+      return
+    }
     http.post(`${API.home}/sys/limitFree/receive`, {
       course_id: courseId
     })