diff --git a/api/knowledge.js b/api/knowledge.js index 2ee1356..040f275 100644 --- a/api/knowledge.js +++ b/api/knowledge.js @@ -90,14 +90,14 @@ export function myStudylist(data) { * 获取课程列表 */ export function getCourses(data) { - return request.post("/Course/listCourses",data); + return request.get("/lession/lessionList",data); } /** * 获取课程详情 */ export function getCourseDetail(data) { - return request.post("/Course/courseDetail",data); + return request.post("/lession/lessionDetail",data); } /** diff --git a/config/index.js b/config/index.js index d972d01..08b3df8 100644 --- a/config/index.js +++ b/config/index.js @@ -1,14 +1,8 @@ // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api' -<<<<<<< HEAD -// export const VUE_APP_API_URL = 'http://192.168.0.112:8088/api' -// export const VUE_APP_API_URL = 'http://192.168.0.114:8088/api' -export const VUE_APP_API_URL = 'https://www.cyjyyjy.com/api' -======= // export const VUE_APP_API_URL = 'http://139.186.134.205:9006/api' -export const VUE_APP_API_URL = 'http://192.168.0.110:8098/api' +export const VUE_APP_API_URL = 'http://192.168.0.112:8088/api' // export const VUE_APP_API_URL = 'https://www.cyjyyjy.com:8096/api' ->>>>>>> 00824c5a0f2aa21e0580a759ffd2d820250d7841 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api' // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; diff --git a/manifest.json b/manifest.json index c1d1cf8..0cf6bb7 100644 --- a/manifest.json +++ b/manifest.json @@ -147,14 +147,14 @@ "scope.userLocation" : { "desc" : "你的位置信息将用于小程序位置接口的效果展示" } - } - // "plugins" : { - // // #ifdef MP-WEIXIN - // "live-player-plugin" : { - // "version" : "1.2.8", - // "provider" : "wx2b03c6e691cd7370" - // } - // } + }, + "plugins" : { + // #ifdef MP-WEIXIN + "live-player-plugin": { + "version": "1.3.0", + "provider": "wx2b03c6e691cd7370" + } + } }, // #endif "mp-alipay" : { diff --git a/pages/course/detail.vue b/pages/course/detail.vue index 548d637..c5710e0 100644 --- a/pages/course/detail.vue +++ b/pages/course/detail.vue @@ -3,7 +3,7 @@ - + 相关推荐 + @@ -127,45 +129,31 @@ 座位号:{{detail.seat}} - - + 距离截止时间还剩 - - - 距离截止时间还剩 - - - - - + + + + + - + + - - - - + @@ -343,7 +331,7 @@ let nowTime = Date.parse(new Date())/1000; getCourseDetail({id:this.courseId}).then((res)=>{ uni.hideLoading() - res.data.courseIntroduce = res.data.courseIntroduce.replace(/\暂无内容... - + {{item.courseName}} diff --git a/pages/serviceTeacher/courseDetail.vue b/pages/serviceTeacher/courseDetail.vue index 5a18f29..6813989 100644 --- a/pages/serviceTeacher/courseDetail.vue +++ b/pages/serviceTeacher/courseDetail.vue @@ -1,14 +1,14 @@