path1 不一致

learnOnline/apiService/ChapterApi.js

@@ -7,11 +7,7 @@ const util = require('../utils/util.js')
 // 测试 用 cur_course_id：6438232736871219200 cur_video_id：6290435412296990720
 const getChapterList = (cur_course_id, cur_semester_id, cur_video_id, callback) => {
   util.requestApi({
-<<<<<<< HEAD
     url: util.config.URL_PATH + '/v2/education/courses/' + cur_course_id,
-=======
-    url: util.config.URL_PATH1 + '/v2/education/courses/' + cur_semester_id + '/' + cur_course_id,
->>>>>>> master
     callback: function (res) {
       let i = 0, j = 0, nextVideo = {}, prevVideo = {};
       /* 计算上一章 和 下一章 */
@@ -114,11 +110,7 @@ const getCurrentChapterDetail = (vid, callback) => {
 // 测试 用 device_id : jjhz92fn0.le2a6c06c9g0.thhg7ekb1f8
 const getProgress = (vid, did, sid, callback) => {
   util.requestApi({
-<<<<<<< HEAD
     url: util.config.URL_PATH + '/v2/education/video/' + vid + '/device',
-=======
-    url: util.config.URL_PATH1 + '/v2/education/video/' + sid + '/' + vid + '/device',
->>>>>>> master
     data: {
       device_id: did
     },

learnOnline/apiService/CourseApi.js

@@ -51,11 +51,7 @@ const getCourseList = (isMy, param, callback) => {
 /* 获取某个课程详细信息 - 课程考核 和 课程讨论单独获取 */
 const getCourseDetail = (id, sid, callback) => {
   util.requestApi({
-<<<<<<< HEAD
     url: util.config.URL_PATH + '/v2/education/courses/' + id,
-=======
-    url: util.config.URL_PATH1 + '/v2/education/courses/' + sid + '/' + id,
->>>>>>> master
     callback: function (res) {
       let cur = res.data, _cur = cur.curriculum
       /* 课程类型 curriculum_elective_type 类型 改为 course_type 吴锚要求 */
@@ -136,11 +132,7 @@ const getCourseDetail = (id, sid, callback) => {
 /* 获取课程考核信息 */
 const getCourseAssess = (cid, sid, callback) => {
   util.requestApi({
-<<<<<<< HEAD
     url: util.config.URL_PATH + '/v2/analytics/courses/' + cid + '/evaluation',
-=======
-    url: util.config.URL_PATH1 + '/v2/analytics/courses/' + sid + '/' + cid + '/evaluation',
->>>>>>> master
     callback: function (res) {
       let cur = res.data
       let video = [];
@@ -196,11 +188,7 @@ const getCourseAssess = (cid, sid, callback) => {
 /* 获取试题信息 */
 const getExamDetail = (eid, sid, callback) => {
   util.requestApi({
-<<<<<<< HEAD
     url: util.config.URL_PATH + '/v2/education/homeworks/' + eid,
-=======
-    url: util.config.URL_PATH1 + '/v2/education/homeworks/' + sid + '/' + eid,
->>>>>>> master
     callback: function (res) {
       callback(res)
     }
@@ -220,13 +208,8 @@ const submitExamDetail = (param, callback) => {
 /* 选课 */
 const selectCourse = (cid, sid, callback) => {
   util.requestApi({
-<<<<<<< HEAD
     url: util.config.URL_PATH + '/v2/education/courses/major',
     data: { course_id: cid },
-=======
-    url: util.config.URL_PATH1 + '/v2/education/courses/major',
-    data: { course_id: cid, semester_id: sid },
->>>>>>> master
     method: 'POST',
     callback: function (res) {
       callback(res)
@@ -236,13 +219,8 @@ const selectCourse = (cid, sid, callback) => {
 /* 退课 */
 const outSelectCourse = (cid, sid, callback) => {
   util.requestApi({
-<<<<<<< HEAD
     url: util.config.URL_PATH + '/v2/education/courses/drop',
     data: { course_id: cid },
-=======
-    url: util.config.URL_PATH1 + '/v2/education/courses/drop',
-    data: { course_id: cid, semester_id: sid },
->>>>>>> master
     method: 'POST',
     callback: function (res) {
       callback(res)

learnOnline/utils/util.js

@@ -7,7 +7,7 @@ const config = {
   // URL_PATH: 'https://api2.ezijing.com', // 测试域名
   // outSiteLink: 'https://kelley2.ezijing.com', // 测试外链
   URL_PATH: 'https://api.ezijing.com/tenant', // 正式域名 - 由于项目变动域名
-  URL_PATH1: 'https://lms-api.ezijing.com/ep', // 正式域名 - 由于项目变动域名
+  URL_PATH1: 'https://ep-api.ezijing.com', // 正式域名 - 由于项目变动域名
   URL_PATH2: 'https://sso.ezijing.com', // 正式域名 - 由于项目变动域名
   outSiteLink: 'https://e-learning.ezijing.com', // 正式外链
   tenant: 'classes'