Merge branch 'master' into wxl-develop

.gitignore

@@ -5,7 +5,7 @@
 
 # production
 /dist
-
+.history
 # misc
 .DS_Store
 npm-debug.log*

src/pages/studentinfo/index.js

@@ -865,7 +865,7 @@ class StudentMgt extends React.Component {
                                 case 7:
                                   return <div className={pageStyle.logitem}> {item.created_at} 老师：<span className={pageStyle.logTeacherName}>{item.data.teacher_name || '-'}</span> 为学员 <span className={pageStyle.logTeacherName}>{item.data.student_name || '-'}</span> 的课程 <span className={pageStyle.logTeacherName}>{item.data.course_title || '-'}</span> 进行<span className={pageStyle.logAction}>退课操作</span>。</div>;
                                 case 8:
-                                  return <div className={pageStyle.logitem}> {item.created_at} 老师：<span className={pageStyle.logTeacherName}>{item.data.teacher_name || '-'}</span> 将学员 <span className={pageStyle.logTeacherName}>{item.data.student_name || '-'}</span> 的课程 <span className={pageStyle.logTeacherName}>{item.data.from_course_title || '-'}</span> <span className={pageStyle.logAction}>转到</span>课程 <span className={pageStyle.logTeacherName}>{item.data.to_course_title || '-'}</span></div>;
+                                  return <div className={pageStyle.logitem}> {item.created_at} 老师：<span className={pageStyle.logTeacherName}>{item.data.teacher_name || '-'}</span> 将学员 <span className={pageStyle.logTeacherName}>{item.data.student_name || '-'}</span> 的课程 <span className={pageStyle.logTeacherName}>{item.data.from_course_title || '-'}</span> <span className={pageStyle.logAction}>转到</span>课程 <span className={pageStyle.logTeacherName}>{item.data.to_course_title || '-'}</span>    <span>{item.data.course_mode == 1 && '课时：'}{item.data.course_mode == 2 && '时段：'}</span>   <span>{item.data.course_num}{item.data.course_mode == 1 && '课时'}{item.data.course_mode == 2 && '天'}</span></div>;
                                 case 9:
                                   return <div className={pageStyle.logitem}>{item.created_at} 老师：<span className={pageStyle.logTeacherName}>{item.data.teacher_name || '-'}</span> 为学员：<span className={pageStyle.logTeacherName}>{item.data.student_name || '-'}</span> <span className={pageStyle.logAction}>消除课时</span>：{item.data.expend || '-'}{item.data.mode_type == 2 && '天'} (<span className={pageStyle.logTeacherName}>{item.data.course_title || '-'}</span> )</div>;
                                 case 10: