feat:解决合并代码后的冲突

src/modules/course-manage/AddLive.jsx

@@ -346,7 +346,9 @@ handleChangeBasicInfo = (field, value) => {
         CourseService.createLiveCloudCourse(params).then((res) => {
         CourseService.createLiveCloudCourse(params).then((res) => {
           if (res.success){
           if (res.success){
             message.success("新建成功");
             message.success("新建成功");
-            window.RCHistory.goBack();
+            window.RCHistory.push({
+              pathname: `/live-course`,
+            });
           }  
           }  
         });
         });
 
 
@@ -359,7 +361,9 @@ handleChangeBasicInfo = (field, value) => {
         CourseService.updateLiveCloudCourse(params).then((res) => {
         CourseService.updateLiveCloudCourse(params).then((res) => {
           if (res.success){
           if (res.success){
             message.success("更新成功");
             message.success("更新成功");
-            window.RCHistory.goBack();
+            window.RCHistory.push({
+              pathname: `/live-course`,
+            });
           }
           }
         });
         });
       }
       }
@@ -493,11 +497,15 @@ handleChangeBasicInfo = (field, value) => {
         cancelText: '留在本页',
         cancelText: '留在本页',
         icon: <span className="icon iconfont default-confirm-icon">&#xe6f4;</span>,
         icon: <span className="icon iconfont default-confirm-icon">&#xe6f4;</span>,
         onOk: () =>  {
         onOk: () =>  {
-          window.RCHistory.goBack();
+          window.RCHistory.push({
+            pathname: `/live-course`,
+          });
         }
         }
       })
       })
     } else {
     } else {
-      window.RCHistory.goBack();
+      window.RCHistory.push({
+        pathname: `/live-course`,
+      });
     }
     }
   }
   }
 
 

src/modules/course-manage/video-course/AddVideoCourse.jsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2020-08-05 10:07:47
  * @Date: 2020-08-05 10:07:47
  * @LastEditors: zhangleyuan
  * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-03-11 15:48:17
+ * @LastEditTime: 2021-03-12 10:21:13
  * @Description: 视频课新增/编辑页
  * @Description: 视频课新增/编辑页
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
  */
@@ -200,11 +200,15 @@ class AddVideoCourse extends React.Component {
         cancelText: '留在本页',
         cancelText: '留在本页',
         icon: <span className="icon iconfont default-confirm-icon">&#xe6f4;</span>,
         icon: <span className="icon iconfont default-confirm-icon">&#xe6f4;</span>,
         onOk: () => {
         onOk: () => {
-          RCHistory.goBack();
+          window.RCHistory.push({
+            pathname: `/video-course`,
+          });
         }
         }
       });
       });
     }else{
     }else{
-      RCHistory.goBack();
+      window.RCHistory.push({
+        pathname: `/video-course`,
+      });
     }
     }
   }
   }
 
 
@@ -349,7 +353,9 @@ class AddVideoCourse extends React.Component {
         CourseService.createVideoSchedule(commonParams).then((res) => {
         CourseService.createVideoSchedule(commonParams).then((res) => {
           if (!res) return;
           if (!res) return;
           message.success("新建成功");
           message.success("新建成功");
-          window.RCHistory.goBack();
+          window.RCHistory.push({
+            pathname: `/video-course`,
+          });
         })
         })
       } else {
       } else {
         const editParams = {
         const editParams = {
@@ -359,7 +365,9 @@ class AddVideoCourse extends React.Component {
         CourseService.editVideoSchedule(editParams).then((res) => {
         CourseService.editVideoSchedule(editParams).then((res) => {
           if (!res) return;
           if (!res) return;
           message.success("保存成功");
           message.success("保存成功");
-          window.RCHistory.goBack();
+          window.RCHistory.push({
+            pathname: `/video-course`,
+          });
         });
         });
       }
       }
     });
     });