From 35659a66d4193cae3ad9967d462e6448ee6968c2 Mon Sep 17 00:00:00 2001 From: harry Date: Mon, 16 Mar 2020 10:45:23 +0800 Subject: [PATCH] fix --- public/react/public/index.html | 199 +----------- public/react/src/App.js | 539 +++++++++++++++------------------ 2 files changed, 248 insertions(+), 490 deletions(-) diff --git a/public/react/public/index.html b/public/react/public/index.html index 59e66b0d4..e2dd520ab 100755 --- a/public/react/public/index.html +++ b/public/react/public/index.html @@ -2,6 +2,7 @@ + @@ -16,186 +17,26 @@ Content=”EduCoder翻转课堂教学模式，颠覆了传统教学模式，让教师与学生的关系由“权威”变成了“伙伴”。将学习的主动权转交给学生，使学生可个性化化学，学生的学习主体得到了彰显。”> -<<<<<<< HEAD - - - - - - - - - - - - - - - -
- - - - -======= - - - - - - - - - - - - - - - - - - - - @@ -215,29 +56,7 @@ -
- - - - - - - - - - - - - - - - - - - - - -
+
@@ -268,25 +87,11 @@ } } ->>>>>>> dc8805b... webpack 构建flv.js 报错，估计是webpack版本过低，不支持typescript等 - - -<<<<<<< HEAD -======= })(); - - - - - - ->>>>>>> dc8805b... webpack 构建flv.js 报错，估计是webpack版本过低，不支持typescript等 \ No newline at end of file diff --git a/public/react/src/App.js b/public/react/src/App.js index b62d365c2..adb964d06 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -324,20 +324,6 @@ class App extends Component { initAxiosInterceptors(this.props); this.getAppdata(); - // - // axios.interceptors.response.use((response) => { - // // console.log("response"+response); - // if(response!=undefined) - // // console.log("response"+response.data.statu); - // if (response&&response.data.status === 407) { - // this.setState({ - // isRenders: true, - // }) - // } - // return response; - // }, (error) => { - // //TODO 这里如果样式变了会出现css不加载的情况 - // }); window.addEventListener('error', (event) => { const msg = `${event.type}: ${event.message}`; @@ -430,306 +416,273 @@ class App extends Component { return ( - - - this.Modifyloginvalue()}> - - - - this.HideAddcoursestypess(i)} /> - - - - - - {/*题库*/} - { - - return () - } - }> - {/*题库*/} - { - - return () - } - }> - {/*/!*众包创新*!/*/} - {/**/} - {/*竞赛*/} - { - - return () - } - }> - - {/*黑客松定制竞赛*/} - { - return ( - - ) - } + + this.Modifyloginvalue()}> + + + + this.HideAddcoursestypess(i)} /> + + + + + + {/*题库*/} + { + + return () } - /> + }> + {/*题库*/} + { - {/*认证*/} - + return () + } + }> + {/*/!*众包创新*!/*/} + {/**/} + {/*竞赛*/} + { + + return () + } + }> + + {/*黑客松定制竞赛*/} + { + return ( + + ) + } + } + /> - {/*403*/} - + {/*认证*/} + - + {/*403*/} + - {/*404*/} - + - - { + {/*404*/} + - return () - } - } - /> - { - - return () - } + + { + + return () } - /> - - - - - - { - - return () - } - }> - - { - return () - } - }> - {/* ()*/} - {/*}*/} - {/*/>*/} - { - - return () - } - }> - - {/*/>*/} - - - () - } /> - {/* jupyter */} - { - return () - } + } + /> + { + + return () } - /> + } + /> + + + + - + { - {/**/} - {/**/} + return () + } + }> - () + { + return () } - > - () + }> + {/* ()*/} + {/*}*/} + {/*/>*/} + { + + return () } - > - {/*实训课程（原实训路径）*/} - - () + }> + + {/*/>*/} + + + () + } /> + {/* jupyter */} + { + return () } - > - {/*课堂*/} - - - {/* - */} - {/* 教学案例 */} - () + } + /> + + + + {/**/} + {/**/} + + () + } + > + () + } + > + {/*实训课程（原实训路径）*/} + + () + } + > + {/*课堂*/} + + + {/* 教学案例 */} + () + } /> + + () + } + > + + + ()} + > + ()} /> + ()} /> + + + + () } /> + {/* jupyter */} + { + return () + }} + /> - () - } - > - - - {/**/} - {/**/} - {/**/} - {/**/} - {/**/} - {/* ()*/} - {/*}*/} - {/*/>*/} - - () - } - > - () - } /> - () - } /> + () + } + /> + () + } /> + () + } /> + () + } /> + () + } /> - return () - } + () + } /> + + () + } /> + () + } /> + + () + } /> + () + } /> + () + } /> + + () + } /> + + () + } /> + + () + } /> + () } /> - {/**/} - - - () - } /> - {/* jupyter */} - { - return () - }} - /> - - () - } - /> - () - } /> - () - } /> - () - } /> - () - } /> - - () - } /> - - () - } /> - () - } /> - - () - } /> - () - } /> - () - } /> - - () - } /> - - () - } /> - - () - } /> - () - } - /> - + - - - + +