diff --git a/src/api/boe/userbasic.js b/src/api/boe/userbasic.js index 80f625f2..29086e8f 100644 --- a/src/api/boe/userbasic.js +++ b/src/api/boe/userbasic.js @@ -8,6 +8,13 @@ const login = function() { return ajax.post(baseURL,'/org/userParentOrg',{}); } +/**退出*/ +const logout = function() { + return ajax.postJson(baseURL,'/userbasic/logout',{from:'pc'}); +} + + + /** * 获取用户的组织机构 * organization_id @@ -106,5 +113,6 @@ export default { modifyPassword, getInAudienceIds, getUsersByIds, - updateUser + updateUser, + logout } diff --git a/src/api/modules/course.js b/src/api/modules/course.js index 2637ad9d..3f4e503b 100644 --- a/src/api/modules/course.js +++ b/src/api/modules/course.js @@ -1,7 +1,7 @@ /** * 课程的操作,课程的添加,修改,列表查询,课程的审核发布等操作。 * 针对于管理员,教师的功能 - * + * **/ import ajax from '@/utils/xajax.js' @@ -68,7 +68,7 @@ const revokeSubmit = function(id) { /** * 复制课程 - * @param {Object} + * @param {Object} */ const copyCourse = function(data) { return ajax.post('/xboe/m/course/manage/copy',data); @@ -330,7 +330,7 @@ const auditPageRecords = function(data) { * { courseId:必须} */ const auditCourseRecords = function(data) { - return ajax.post('/xboe/m/course/audit/course-records', data); + return ajax.post('/xboe/m/course/audit/course-records',data); } /** @@ -347,7 +347,7 @@ const auditAndPublish=function(data) { /** * 设置top - * @param {Object} query {ids:课程id,多个使用逗号分隔,title:课程的名称, Boolean top 是否置顶} + * @param {Object} query {ids:课程id,多个使用逗号分隔,title:课程的名称,Boolean top 是否置顶} */ const setTop = function(data) { return ajax.post('/xboe/m/course/manage/top', data); diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index db592bff..81aac052 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -1484,6 +1484,7 @@ export default { aid:rs.result.id, orgId:rs.result.orgId } + //下面的机构名称,路径不对,应该取课程的资源归属(机构)的路径 postData.course.orgName=rs.result.orgNamePath+'/'+rs.result.orgName; apiCourse.submitCourse(postData).then(res => { //this.btnLoading=false; diff --git a/src/store/modules/user.js b/src/store/modules/user.js index cb1fb17b..b2c27793 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -7,6 +7,7 @@ import apiCourse from "@/api/modules/course.js"; import apiBoeCourse from "@/api/boe/course.js"; import apiBoeLogout from "@/api/boe/login.js"; import apiStat from "@/api/phase2/stat.js"; +import apiUserbasic from '@/api/boe/userebasic.js'; const user = { state: { @@ -226,9 +227,9 @@ const user = { apiBoeLogout.logout(); commit('SET_PERMISSIONS', []) removeToken() - //resolve() - - apiLogin.logout().then(() => { + //resolve() + //apiLogin.logout(); + apiUserbasic.logout().then(() => { resolve() }).catch(error => { reject(error)