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

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

src/modules/course-manage/LiveCoursePage.jsx

@@ -22,6 +22,13 @@ class LiveCoursePage extends React.Component {
   componentWillMount() {
   componentWillMount() {
     this.handleFetchLiveList(this.state.query);
     this.handleFetchLiveList(this.state.query);
   }
   }
+  changeShelfState = (index, shelfState) => {
+    const { courseList } = this.state;
+    courseList[index].shelfState = shelfState;
+    this.setState({
+      courseList,
+    });
+  };
   // 获取直播课列表
   // 获取直播课列表
   handleFetchLiveList = (_query) => {
   handleFetchLiveList = (_query) => {
     const { query } = this.state;
     const { query } = this.state;
@@ -54,6 +61,7 @@ class LiveCoursePage extends React.Component {
             total={total}
             total={total}
             courseList={courseList}
             courseList={courseList}
             onChange={this.handleFetchLiveList}
             onChange={this.handleFetchLiveList}
+            changeShelfState={this.changeShelfState}
           />
           />
         </div>
         </div>
       </div>
       </div>

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

@@ -94,7 +94,7 @@ class LiveCourseList extends React.Component {
   };
   };
 
 
   //改变上架状态
   //改变上架状态
-  changeShelfState = (item) => {
+  changeShelfState = (index,item) => {
     let _shelfState = item.shelfState;
     let _shelfState = item.shelfState;
     if (_shelfState === 'NO') {
     if (_shelfState === 'NO') {
       _shelfState = 'YES';
       _shelfState = 'YES';
@@ -114,6 +114,7 @@ class LiveCourseList extends React.Component {
         } else {
         } else {
           message.success('已取消展示');
           message.success('已取消展示');
         }
         }
+        this.props.changeShelfState(index,_shelfState)
       }
       }
     });
     });
   };
   };
@@ -289,7 +290,7 @@ 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(item)} />;
+            return <Switch defaultChecked={item.shelfState === 'YES' ? true : false} onChange={() => this.changeShelfState(index,item)} />;
           },
           },
         },
         },
         {
         {

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

@@ -143,7 +143,7 @@ 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(item)}/>
+            <Switch  defaultChecked={item.shelfState==="YES"?true:false}  onChange={()=>this.changeShelfState(index,item)}/>
           ) 
           ) 
         },
         },
       },
       },
@@ -296,7 +296,7 @@ class GraphicsCourseList extends React.Component {
     )
     )
   }
   }
     //改变上架状态
     //改变上架状态
-  changeShelfState = (item) =>{
+  changeShelfState = (index,item) =>{
     let _shelfState = item.shelfState
     let _shelfState = item.shelfState
     if(_shelfState==='NO'){
     if(_shelfState==='NO'){
       _shelfState = "YES";
       _shelfState = "YES";
@@ -316,6 +316,7 @@ class GraphicsCourseList extends React.Component {
         }else{
         }else{
           message.success("已取消展示");
           message.success("已取消展示");
         }
         }
+        this.props.changeShelfState(index,_shelfState)
       }
       }
     }) 
     }) 
   }
   }

src/modules/course-manage/graphics-course/index.jsx

@@ -27,6 +27,13 @@ class GraphicsCourse extends React.Component {
     this.handleFetchScheduleList();
     this.handleFetchScheduleList();
   }
   }
 
 
+  changeShelfState = (index, shelfState) => {
+    const { dataSource } = this.state;
+    dataSource[index].shelfState = shelfState;
+    this.setState({
+      dataSource,
+    });
+  };
   // 获取视频课列表
   // 获取视频课列表
   handleFetchScheduleList = (_query = {}) => {
   handleFetchScheduleList = (_query = {}) => {
     const query = {
     const query = {
@@ -75,6 +82,7 @@ class GraphicsCourse extends React.Component {
             dataSource={dataSource}
             dataSource={dataSource}
             totalCount={totalCount}
             totalCount={totalCount}
             onChange={this.handleFetchScheduleList}
             onChange={this.handleFetchScheduleList}
+            changeShelfState={this.changeShelfState}
           />
           />
         </div>
         </div>
       </div>
       </div>