Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into dev

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

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

@@ -94,13 +94,13 @@ class LiveCourseList extends React.Component {
   };
   };
 
 
   //改变上架状态
   //改变上架状态
-  changeShelfState = (index,item) => {
-    let _shelfState = item.shelfState;
-    if (_shelfState === 'NO') {
-      _shelfState = 'YES';
-    } else {
-      _shelfState = 'NO';
-    }
+  changeShelfState = (index,item,checked) => {
+    let _shelfState = checked ? "YES" : "NO"
+    // if (_shelfState === 'NO') {
+    //   _shelfState = 'YES';
+    // } else {
+    //   _shelfState = 'NO';
+    // }
     const params = {
     const params = {
       liveCourseId: item.liveCourseId,
       liveCourseId: item.liveCourseId,
       shelfState: _shelfState,
       shelfState: _shelfState,
@@ -288,7 +288,10 @@ class LiveCourseList extends React.Component {
           key: 'shelfState',
           key: 'shelfState',
           dataIndex: 'shelfState',
           dataIndex: 'shelfState',
           render: (val, item, index) => {
           render: (val, item, index) => {
-            return <Switch defaultChecked={item.shelfState === 'YES' ? true : false} onChange={() => this.changeShelfState(index,item)} />;
+            return <Switch 
+                    checked={item.shelfState === "YES"} 
+                    defaultChecked={item.shelfState === 'YES' ? true : false} 
+                    onChange={(checked) => this.changeShelfState(index,item,checked)} />;
           },
           },
         },
         },
         {
         {

src/modules/course-manage/graphics-course/components/GraphicsCourseList.jsx

@@ -143,7 +143,10 @@ class GraphicsCourseList extends React.Component {
         dataIndex: "courseware",
         dataIndex: "courseware",
         render: (val, item, index) => {
         render: (val, item, index) => {
           return  (
           return  (
-            <Switch  defaultChecked={item.shelfState==="YES"?true:false}  onChange={()=>this.changeShelfState(index,item)}/>
+            <Switch 
+            checked={item.shelfState === "YES"} 
+            defaultChecked={item.shelfState==="YES"?true:false}  
+            onChange={(checked)=>this.changeShelfState(index,item,checked)}/>
           ) 
           ) 
         },
         },
       },
       },
@@ -296,13 +299,13 @@ class GraphicsCourseList extends React.Component {
     )
     )
   }
   }
     //改变上架状态
     //改变上架状态
-  changeShelfState = (index,item) =>{
-    let _shelfState = item.shelfState
-    if(_shelfState==='NO'){
-      _shelfState = "YES";
-    }else{
-      _shelfState = "NO"
-    }
+  changeShelfState = (index,item,checked) =>{
+    let _shelfState = checked ? "YES" : "NO"
+    // if(_shelfState==='NO'){
+    //   _shelfState = "YES";
+    // }else{
+    //   _shelfState = "NO"
+    // }
     const params={
     const params={
       courseId: item.id,
       courseId: item.id,
       shelfState:_shelfState
       shelfState:_shelfState