Skip to content

M
mt-education-mobile
Commit 8885794c authored by 刘岩's avatar 刘岩
Browse files
Options

学习课程增加消耗积分测试

parent ef79131f
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 42 deletions
src/api/test.js
View file @ 8885794c
......@@ -12,7 +12,6 @@ const api = {
Course: '/BCourse/queryFirstBCourse',
HomeBLessons: '/BLesson/queryHomeBLessonsByPagination', // 610
ListAllLesson: '/BLesson/queryListAllLessonByPagination', // 616 更多接口
myInfo: '/user/queryMyInfo', // 我的智学 个人中心
BCourse: '/BCourse/queryBCourseByPagination', // 302 分类
queryBlabels: '/BLabel/queryBlabels', // 505 根据条件查询标签
/* 章节相关 */
......@@ -49,7 +48,8 @@ const api = {
getOneLessonDiscuss: '/bdiscuss', // 查询评论
addCourseDiscuss: '/bdiscuss/add', // 添加评论
deleteCourseDiscuss: '/bdiscuss/delete', // 删除评论
getMyInfo: '/user/queryMyInfo' // 获取当前登陆人信息
getMyInfo: '/user/queryMyInfo', // 获取当前登陆人信息 我的智学 个人中心
learning: '/BLesson/learning' // 判断是正在学该课程 643
}
export default api
......@@ -146,7 +146,7 @@ export const get = {
params: params
})
},
// 我的智学 个人中心 请求
// 课程查询 筛选条件 标签 请求
getQueryBlabels: (params) => {
return axios({
url: api.queryBlabels,
......@@ -154,14 +154,6 @@ export const get = {
params: params
})
},
// 课程查询 筛选条件 标签 请求
getMyInfo: (params) => {
return axios({
url: api.myInfo,
method: 'get',
params: params
})
},
// 我的智学 - 我发布的课程 请求
getByPagination: (params) => {
return axios({
......@@ -244,7 +236,7 @@ export const get = {
params: params
})
},
// 获取当前登录人信息
// 获取当前登录人信息 我的智学 个人中心 请求
getMyCurInfo: (params) => {
return axios({
url: api.getMyInfo,
......@@ -267,6 +259,14 @@ export const get = {
method: 'get',
params: params
})
},
// 判断是正在学该课程 请求
getLearning: (params) => {
return axios({
url: api.learning,
method: 'get',
params: params
})
}
}
// post 请求
......
src/components/Home/curriculum.vue
View file @ 8885794c
......@@ -3,8 +3,8 @@
<div class="curriculum">
<span
class="integral"
v-if="data.value !== 'undefined' && data.value !== undefined && data.value !== '' && data.value !== '0'"
>{{ data.value }}积分</span>
v-if="data.valueConsume !== 'undefined' && data.valueConsume !== undefined && data.valueConsume !== '' && data.valueConsume !== 0"
>{{ data.valueConsume }}积分</span>
<img
class="con-img"
:src="data.defaultUrl"
......
src/components/Search/index.vue
View file @ 8885794c
......@@ -53,7 +53,7 @@
class="con-box large-con-box"
v-for="(item,index) in tabsContentList"
:key="index"
@click="$curriculumTrainRouter(item.lessonType, item.businessId)"
@click="$curriculumTrainRouter(item.lessonType, item.businessId, '', item.valueConsume, item.lecturerId, item.lessonName)"
>
<curriculum :item="item" />
</div>
......
src/utils/index.js
View file @ 8885794c
/**
* Created by PanJiaChen on 16/11/18.
*/
import {get} from '@/api/test'
/**
* Parse the time to string
* @param {(Object|string|number)} time
......@@ -389,24 +389,64 @@ export function removeClass(ele, cls) {
* @param lessonType 0：线上课程 1：线下培训
* @param id 课程、培训 ID
* @param fromName 返回的的路由 name
* @param valueConsume 消耗积分
* @param lecturerId 讲师ID
* @param lessonName 课程名称
*/
export function curriculumTrainRouter(lessonType, id, fromName) {
if (lessonType === '0') {
this.$router.push({
name: 'CourseDetail',
query: {
id: id
}
})
} else if (lessonType === '1') {
this.$router.push({
name: 'TrainDetail',
query: {
id: id,
fromName: fromName,
role: 'people'
}
})
}
export function curriculumTrainRouter(lessonType, id, fromName, valueConsume, lecturerId, lessonName) {
// 当前登录人请求
get.getMyCurInfo({
requireId: ''
}).then(res => {
if (lessonType === '0') {
// 判断是正在学该课程
get.getLearning({
lessonId: id
}).then(isRes => {
if (valueConsume > 0 && isRes.data.data === 1 && lecturerId !== res.data.data.id) {
if (valueConsume > res.data.data.value) {
this.$dialog({
width: '270px',
title: lessonName,
message: '积分不足'
})
return false
}
this.$dialog.confirm({
width: '270px',
title: lessonName,
message: '需要消耗' + valueConsume + '积分',
confirmButtonText: '加入学习',
confirmButtonColor: '#44908f'
}).then(() => {
this.$router.push({
name: 'CourseDetail',
query: {
id: id
}
})
}).catch((err) => {
console.log(err)
})
} else {
this.$router.push({
name: 'CourseDetail',
query: {
id: id
}
})
}
})
} else if (lessonType === '1') {
this.$router.push({
name: 'TrainDetail',
query: {
id: id,
fromName: fromName,
role: 'people'
}
})
}
})
}
src/views/Home/index.vue
View file @ 8885794c
......@@ -113,7 +113,7 @@
class="con-box"
v-for="(item,index) in enterprise"
:key="index"
@click="$curriculumTrainRouter(item.lessonType, item.businessId, 'Home')"
@click="$curriculumTrainRouter(item.lessonType, item.businessId, 'Home', item.valueConsume, item.lecturerId, item.lessonName)"
>
<curriculum :item="item" />
</div>
......@@ -148,7 +148,7 @@
class="con-box"
v-for="(item,index) in AreLearning"
:key="index"
@click="$curriculumTrainRouter(item.lessonType, item.businessId, 'Home')"
@click="$curriculumTrainRouter(item.lessonType, item.businessId, 'Home', item.valueConsume, item.lecturerId, item.lessonName)"
>
<curriculum :item="item" />
</div>
......@@ -183,7 +183,7 @@
class="con-box"
v-for="(item,index) in HottestConcern"
:key="index"
@click="$curriculumTrainRouter(item.lessonType, item.businessId, 'Home')"
@click="$curriculumTrainRouter(item.lessonType, item.businessId, 'Home', item.valueConsume, item.lecturerId, item.lessonName)"
>
<curriculum :item="item" />
</div>
......@@ -218,7 +218,7 @@
class="con-box"
v-for="(item,index) in BeInterested"
:key="index"
@click="$curriculumTrainRouter(item.lessonType, item.businessId, 'Home')"
@click="$curriculumTrainRouter(item.lessonType, item.businessId, 'Home', item.valueConsume, item.lecturerId, item.lessonName)"
>
<curriculum :item="item" />
</div>
......@@ -264,7 +264,7 @@
class="con-box large-con-box"
v-for="(item,index) in tabsContentList"
:key="index"
@click="$curriculumTrainRouter(item.lessonType, item.businessId, 'Home')"
@click="$curriculumTrainRouter(item.lessonType, item.businessId, 'Home', item.valueConsume, item.lecturerId, item.lessonName)"
>
<curriculum :item="item" />
</div>
......
src/views/More/index.vue
View file @ 8885794c
......@@ -50,7 +50,7 @@
class="con-box large-con-box"
v-for="(item,index) in tabsContentList"
:key="index"
@click="$curriculumTrainRouter(item.lessonType, item.businessId)"
@click="$curriculumTrainRouter(item.lessonType, item.businessId, '', item.valueConsume, item.lecturerId, item.lessonName)"
>
<curriculum :item="item" />
</div>
......
src/views/PersonalCenter/index.vue
View file @ 8885794c
......@@ -157,7 +157,7 @@ export default {
},
// 我的智学 个人中心 数据请求
async myInfo() {
const res = await get.getMyInfo({
const res = await get.getMyCurInfo({
requireId: ''
})
this.personalData = res.data.data
......
src/views/classification/classificationResult.vue
View file @ 8885794c
......@@ -74,7 +74,7 @@
class="con-box large-con-box"
v-for="(item,index) in tabsContentList"
:key="index"
@click="$curriculumTrainRouter(item.lessonType, item.businessId)"
@click="$curriculumTrainRouter(item.lessonType, item.businessId, '', item.valueConsume, item.lecturerId, item.lessonName)"
>
<curriculum :item="item" />
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment