|
|
@@ -319,11 +319,10 @@ export default {
|
|
|
async onClick(item, index) {
|
|
|
this.examPopup = item
|
|
|
this.countTotal = await this.getExamCount(item.examId) || 0
|
|
|
- if (this.countTotal.count > +item.limitCount) {
|
|
|
+ if (this.countTotal.count >= parseInt(item.limitCount) && !this.countTotal.notStart) {
|
|
|
return Notify({ type: 'primary', message: '本次考试次数已达到上限!' })
|
|
|
- } else {
|
|
|
- this.ReachBottomShow = true
|
|
|
}
|
|
|
+ this.ReachBottomShow = true
|
|
|
},
|
|
|
|
|
|
showPopup() {
|
|
|
@@ -335,7 +334,7 @@ export default {
|
|
|
// 点击确定进入考试界面
|
|
|
async changeShowPop(item) {
|
|
|
this.countTotal = await this.getExamCount(item.examId) || 0
|
|
|
- if (this.countTotal.count > +item.limitCount) {
|
|
|
+ if (this.countTotal.count >= parseInt(item.limitCount) && !this.countTotal.notStart) {
|
|
|
return Notify({ type: 'primary', message: '本次考试次数已达到上限!' })
|
|
|
}
|
|
|
this.ReachBottomShow = false
|
|
|
@@ -481,6 +480,7 @@ export default {
|
|
|
* 加载数据
|
|
|
*/
|
|
|
loadData() {
|
|
|
+ console.log('111')
|
|
|
this.loading = true
|
|
|
let page = 0
|
|
|
if (this.current === 0) {
|