Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/new/CoursesNew.js

@@ -646,7 +646,7 @@ class CoursesNew extends Component {
                                     </Form.Item>
                                 </div>
 
-															<div className="stud-class-set padding10200 coursenavbox mb20">
+															<div className="stud-class-set padding10200 mb20">
 																<Form.Item label="课堂所属单位">
 																	{getFieldDecorator('school', {
 																		rules: [{required: true, message: "不能为空"}],

public/react/src/modules/courses/poll/PollInfo.js

@@ -315,7 +315,7 @@ class PollInfo extends Component{
         ></Modals>
         <div className="educontent mt10 mb50">
           <p className="clearfix mb20">
-            <WordsBtn style="grey" className="fl" to={current_user.first_category_url}>{courseName}</WordsBtn>
+            <WordsBtn style="grey" className="fl" to={current_user && current_user.first_category_url}>{courseName}</WordsBtn>
             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
             <WordsBtn style="grey" className="fl" to={`/courses/${this.props.match.params.coursesId}/polls/${poll && poll.left_banner_id}`}>问卷</WordsBtn>
             <span className="color-grey-9 fl ml3 mr3">&gt;</span>