Commit d2036f52 authored by Facius's avatar Facius

Merge branch 'dev-v1.0.0' of https://git.banshouhui.com/wuzhenzhe/study into dev-v1.0.0

parents abcfa346 216aa567
...@@ -134,8 +134,9 @@ export default { ...@@ -134,8 +134,9 @@ export default {
}, },
avatar() { avatar() {
return ( return (
(this.student && this.student.avatarPath) || (this.vuex_token &&
(this.userInfo && this.userInfo.avatarUrl) || ((this.student && this.student.avatarPath) ||
this.userInfo.avatarUrl)) ||
this.pic this.pic
) )
}, },
......
...@@ -293,15 +293,11 @@ export default { ...@@ -293,15 +293,11 @@ export default {
source: this.source, source: this.source,
} }
uni.showLoading({
title: '加载中',
})
this.$u.api.getQuestionTotal(params).then((res) => { this.$u.api.getQuestionTotal(params).then((res) => {
uni.hideLoading()
// 列表总长度,一定要在第一次请求列表数据前明确该值 // 列表总长度,一定要在第一次请求列表数据前明确该值
// 否则无法知道下一页是否还有数据 // 否则无法知道下一页是否还有数据
let total = parseInt(res) || 0 let total = parseInt(res) || 0
//if (total > 0) { if (total > 0) {
// 考试 // 考试
if (this.type === 2) { if (this.type === 2) {
this.pageSize = this.totalPoint this.pageSize = this.totalPoint
...@@ -317,7 +313,7 @@ export default { ...@@ -317,7 +313,7 @@ export default {
let index = let index =
this.source === 1 ? this.lastIndex[this.questionWarehouseId] || 0 : 0 this.source === 1 ? this.lastIndex[this.questionWarehouseId] || 0 : 0
this.refresh(i ? i : index) this.refresh(i ? i : index)
//} }
}) })
}, },
// 切换 // 切换
...@@ -348,7 +344,7 @@ export default { ...@@ -348,7 +344,7 @@ export default {
if (currentValue.submitStatus) accumulator++ if (currentValue.submitStatus) accumulator++
return accumulator return accumulator
}, 0) }, 0)
if (count > 1) { if (count > 0) {
this.handPapers() this.handPapers()
return return
} }
......
...@@ -147,7 +147,7 @@ export default { ...@@ -147,7 +147,7 @@ export default {
}, },
getFront() { getFront() {
//身份证正面图片识别 //身份证正面图片识别
upload.getPhoto(1, this.token).then((res) => { upload.getPhoto(2, this.token).then((res) => {
this.student.identityFrontPath = res.key this.student.identityFrontPath = res.key
this.$u.api this.$u.api
.getCertifyInfoByType('front', { .getCertifyInfoByType('front', {
...@@ -165,7 +165,7 @@ export default { ...@@ -165,7 +165,7 @@ export default {
}, },
getBack() { getBack() {
//身份证反面图片识别 //身份证反面图片识别
upload.getPhoto(1, this.token).then((res) => { upload.getPhoto(2, this.token).then((res) => {
this.student.identityBackPath = res.key this.student.identityBackPath = res.key
this.$u.api this.$u.api
.getCertifyInfoByType('back', { .getCertifyInfoByType('back', {
......
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