diff --git a/public/react/src/common/Env.js b/public/react/src/common/Env.js index bdd4584f4..283e82c48 100644 --- a/public/react/src/common/Env.js +++ b/public/react/src/common/Env.js @@ -1,3 +1,6 @@ export function isDev() { return window.location.port === "3007"; -} \ No newline at end of file +} + +// const isMobile +export const isMobile = (/android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent.toLowerCase())); \ No newline at end of file diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js index 1d7c66dbb..5b1d7ac28 100644 --- a/public/react/src/common/educoder.js +++ b/public/react/src/common/educoder.js @@ -20,8 +20,7 @@ export { markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, ap downloadFile, sortDirections } from './TextUtil' export { handleDateString, getNextHalfHourOfMoment,formatDuring } from './DateUtil' - -export { isDev as isDev } from './Env' +export { isDev as isDev, isMobile } from './Env' export { toStore as toStore, fromStore as fromStore } from './Store' diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js index d8927b8d7..15f57f130 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js @@ -625,7 +625,7 @@ class CoursesBanner extends Component { ) : ""} - {this.props.isStudent()? this.exitclass()} > 退出课堂 :""} diff --git a/public/react/src/modules/courses/members/modal/AddStudentModal.js b/public/react/src/modules/courses/members/modal/AddStudentModal.js index de95bc741..cf7583a51 100644 --- a/public/react/src/modules/courses/members/modal/AddStudentModal.js +++ b/public/react/src/modules/courses/members/modal/AddStudentModal.js @@ -29,7 +29,7 @@ class AddStudentModal extends Component{ const { name, school_name } = this.state let url = `/courses/${courseId}/search_users.json?page=${page}&limit=${pageCount}&school_name=${school_name || ''}&name=${name || ''}` this.setState({ loading: true }) - axios.get(url) + axios.get(encodeURI(url)) .then((response) => { if (!response.data.users || response.data.users.length == 0) { this.setState({ diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js index ee1f1dacb..70b1e3bd6 100644 --- a/public/react/src/modules/courses/members/teacherList.js +++ b/public/react/src/modules/courses/members/teacherList.js @@ -377,7 +377,7 @@ class studentsList extends Component{ if(searchValue!=""){ url+='&search='+searchValue; } - const result = await axios.get(url) + const result = await axios.get(encodeURI(url)) // axios.get((url)).then((result)=>{ if (result.data.teacher_list) { this.setState({ diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js index d1bf6e1f0..f3c9d514b 100644 --- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js +++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js @@ -160,7 +160,7 @@ class DetailCardsEditAndAdd extends Component{ url+="&type="+id; } - axios.get(url).then((result)=>{ + axios.get(encodeURI(url)).then((result)=>{ if(result.status===200){ this.setState({ ChooseShixunList:result.data, @@ -322,7 +322,7 @@ class DetailCardsEditAndAdd extends Component{ if(type!=0){ url+="&type="+type; } - axios.get(url).then((result)=>{ + axios.get(encodeURI(url)).then((result)=>{ if(result.status===200){ let list =result.data.shixun_list; diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js index 0009e1f98..997786db2 100644 --- a/public/react/src/modules/tpm/TPMBanner.js +++ b/public/react/src/modules/tpm/TPMBanner.js @@ -205,7 +205,7 @@ class TPMBanner extends Component { SenttotheSearch=(value)=>{ let id = this.props.match.params.shixunId; let url="/shixuns/" + id +"/search_user_courses.json?search="+value; - axios.get(url, { + axios.get(encodeURI(url), { params: { page:1, limit:10