Merge branch 'feature/zhujian/0726/qwLiving' into dev

# Conflicts:
#	src/modules/course-manage/components/LiveCourseList.jsx

src/modules/course-manage/components/CreateWorkWXCourse.jsx

@@ -105,9 +105,11 @@ function CreateWorkWXCourse() {
           default:
           default:
             break;
             break;
         }
         }
-
         return item;
         return item;
       });
       });
+      if (!hasIntro) {
+        setGetInfo(true)
+      }
 
 
       const _basicInfo = {
       const _basicInfo = {
         courseName,
         courseName,
@@ -134,6 +136,7 @@ function CreateWorkWXCourse() {
       setBasicInfo(_basicInfo)
       setBasicInfo(_basicInfo)
       setClassInfo(_classInfo)
       setClassInfo(_classInfo)
       setCourseState(courseState)
       setCourseState(courseState)
+      
     });
     });
   };
   };
 
 

src/modules/course-manage/components/LiveCourseList.jsx

@@ -65,7 +65,6 @@ class LiveCourseList extends React.Component {
     this.parseColumns()
     this.parseColumns()
   }
   }
   componentDidMount() {
   componentDidMount() {
-
     this.getDownloadVersion()
     this.getDownloadVersion()
     Bus.bind('freshCourseList',()=>{
     Bus.bind('freshCourseList',()=>{
       this.refreshCourseList()
       this.refreshCourseList()