提交 03289fe5 authored 作者: lihuihui's avatar lihuihui

能力自测修改

上级 fe03411b
...@@ -34,7 +34,7 @@ export function deleteQuestion(data) { ...@@ -34,7 +34,7 @@ export function deleteQuestion(data) {
/* 收藏试题 */ /* 收藏试题 */
export function collectQuestion(data) { export function collectQuestion(data) {
return httpRequest.post('/zy/v2/examination/question/add', data, { return httpRequest.post('/zy/v2/examination/add-collection', data, {
headers: { 'Content-Type': 'multipart/form-data' } headers: { 'Content-Type': 'multipart/form-data' }
}) })
} }
......
...@@ -182,7 +182,26 @@ export default { ...@@ -182,7 +182,26 @@ export default {
} }
}, },
methods: { methods: {
goVip() { async goVip() {
const isLogin = await this.$store.dispatch('checkLogin')
if (!isLogin) {
if (this.isWeapp) {
// 小程序
wx.miniProgram.navigateTo({
url: `/pages/login/index?redirect_uri=${encodeURIComponent(
`/exam/result?type=${this.$route.query.type}&is_create=0&papersUrl=${this.$route.query.papersUrl}`
)}`
})
} else {
this.$router.push({
path: '/login',
query: {
redirect_uri: `/exam/result?type=${this.$route.query.type}&is_create=0&papersUrl=${this.$route.query.papersUrl}`
}
})
}
return false
}
this.$router.push({ this.$router.push({
path: '/payPage' path: '/payPage'
}) })
......
...@@ -482,26 +482,26 @@ export default { ...@@ -482,26 +482,26 @@ export default {
this.signText = '标记' this.signText = '标记'
} }
}, },
async submitShowPop(n) { submitShowPop(n) {
const isLogin = await this.$store.dispatch('checkLogin') // const isLogin = await this.$store.dispatch('checkLogin')
if (!isLogin) { // if (!isLogin) {
if (this.isWeapp) { // if (this.isWeapp) {
// 小程序 // // 小程序
wx.miniProgram.navigateTo({ // wx.miniProgram.navigateTo({
url: `/pages/login/index?redirect_uri=${encodeURIComponent( // url: `/pages/login/index?redirect_uri=${encodeURIComponent(
`/exam/result?type=${this.$route.query.type}&is_create=0&papersUrl=${this.$route.query.papersUrl}` // `/exam/result?type=${this.$route.query.type}&is_create=0&papersUrl=${this.$route.query.papersUrl}`
)}` // )}`
}) // })
} else { // } else {
this.$router.push({ // this.$router.push({
path: '/login', // path: '/login',
query: { // query: {
redirect_uri: `/exam/result?type=${this.$route.query.type}&is_create=0&papersUrl=${this.$route.query.papersUrl}` // redirect_uri: `/exam/result?type=${this.$route.query.type}&is_create=0&papersUrl=${this.$route.query.papersUrl}`
} // }
}) // })
} // }
return false // return false
} // }
if (n === 1) { if (n === 1) {
this.examSubmit(1, true) this.examSubmit(1, true)
return false return false
...@@ -743,9 +743,9 @@ export default { ...@@ -743,9 +743,9 @@ export default {
}, },
initData(n) { initData(n) {
const param = this.requestParam const param = this.requestParam
if (window.localStorage.userId !== 'undefined') { // if (window.localStorage.userId !== 'undefined') {
param.user_id = window.localStorage.userId // param.user_id = window.localStorage.userId
} // }
Exam.getExam(param, decodeURIComponent(this.requestParam.papersUrl)).then(res => { Exam.getExam(param, decodeURIComponent(this.requestParam.papersUrl)).then(res => {
Toast.clear() Toast.clear()
const times = this.$route.query.id === undefined ? res.sheet.remainingTime ? res.sheet.remainingTime : res.sheet.duration : res.sheet.duration const times = this.$route.query.id === undefined ? res.sheet.remainingTime ? res.sheet.remainingTime : res.sheet.duration : res.sheet.duration
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论