Commit 74af15b1 authored by linwenqing's avatar linwenqing

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

parents 67f8d2cc 9ee910f4
......@@ -39,7 +39,7 @@
:loading="loading"
@click="handleClickSure"
>
{{ buttonText }}
确定
</u-button>
</view>
</view>
......@@ -61,11 +61,6 @@ export default {
type: String,
default: '',
},
buttonText: {
// 确定按钮
type: String,
default: '确定',
},
},
data() {
return {
......
......@@ -293,31 +293,27 @@ export default {
source: this.source,
}
uni.showLoading({
title: '加载中',
})
this.$u.api.getQuestionTotal(params).then((res) => {
uni.hideLoading()
// 列表总长度,一定要在第一次请求列表数据前明确该值
// 否则无法知道下一页是否还有数据
let total = parseInt(res) || 0
//if (total > 0) {
// 考试
if (this.type === 2) {
this.pageSize = this.totalPoint
total = this.totalPoint
}
this.total = total
if (total > 0) {
// 考试
if (this.type === 2) {
this.pageSize = this.totalPoint
total = this.totalPoint
}
this.total = total
// 练习模式-初始化答题卡列表
if (this.source === 1) Utils.initAnswerCardList(total, this)
this.cachePageDataMap = new Map()
// 练习模式-初始化答题卡列表
if (this.source === 1) Utils.initAnswerCardList(total, this)
this.cachePageDataMap = new Map()
// 上次答到了第几题
let index =
this.source === 1 ? this.lastIndex[this.questionWarehouseId] || 0 : 0
this.refresh(i ? i : index)
//}
// 上次答到了第几题
let index =
this.source === 1 ? this.lastIndex[this.questionWarehouseId] || 0 : 0
this.refresh(i ? i : index)
}
})
},
// 切换
......@@ -348,7 +344,7 @@ export default {
if (currentValue.submitStatus) accumulator++
return accumulator
}, 0)
if (count > 1) {
if (count > 0) {
this.handPapers()
return
}
......
......@@ -52,26 +52,6 @@
</view>
</view>
</picker>
<!-- <view class="select-area">
<view @click="handleClickArea" class="area-text-view">
<text>{{ currentProvince.label }}</text>
<u-icon name="arrow-down"></u-icon>
</view>
<view class="loading-view" v-if="loading">
<u-loading mode="flower"></u-loading>
</view>
<u-picker
mode="selector"
:range="range"
v-model="show"
:params="params"
safe-area-inset-bottom
cancel-color="#9EA5BB"
confirm-color="#2953FF"
:default-region="defaultRegion"
@confirm="handleConform"
></u-picker>
</view> -->
</view>
<view class="bottom-view">
<u-button
......@@ -80,6 +60,7 @@
shape="circle"
:disabled="buttonDisabled"
:type="buttonDisabled ? '' : 'primary'"
throttle-time="250"
>
确定
</u-button>
......@@ -233,8 +214,8 @@ export default {
console.log(res)
this.range = res || []
},
async handleClickSubmit() {
if (this.buttonDisabled) return
handleClickSubmit() {
// if (this.buttonDisabled) return
if (this.range.length <= 0 || this.range.length == null) {
this.$refs.uToast.show({
title: '该类型和区域没有的题库',
......@@ -246,6 +227,7 @@ export default {
})
return
}
if (this.index == 0) {
this.changeIndex()
}
......@@ -254,46 +236,55 @@ export default {
type: this.selectedTypeId,
}
// 获取科目对应的题库
let res = await this.$u.api.getQuestionWarehouse(this.category.id, param)
if (res && res.length > 0) {
let data = res[0]
// 学员增加自己的题库
let result = await this.$u.api
.addQuestionWarehouse({
questionWarehouseId: data.id,
})
.catch((err) => {
console.log(err)
})
this.$u.api
.getQuestionWarehouse(this.category.id, param)
.then((res) => {
if (res && res.length > 0) {
let data = res[0]
if (result) {
data.isAdd = true
this.setPageInfo(data)
// 成功
this.$refs.uToast.show({
title: '添加题库成功',
type: 'success',
duration: 1500,
callback: () => {
this.showPop = false
uni.switchTab({
url: '/pages/index/index',
// 学员增加自己的题库
this.$u.api
.addQuestionWarehouse({
questionWarehouseId: data.id,
})
},
})
} else {
this.showPop = false
}
} else {
this.$refs.uToast.show({
title: '该类型和区域没有的题库',
type: 'warning',
duration: 1500,
callback: () => {
this.showPop = false
},
.then((result) => {
if (result) {
data.isAdd = true
this.setPageInfo(data)
// 成功
this.$refs.uToast.show({
title: '添加题库成功',
type: 'success',
duration: 1500,
callback: () => {
this.showPop = false
uni.switchTab({
url: '/pages/index/index',
})
},
})
} else {
this.showPop = false
}
})
.catch((err) => {
this.showPop = false
console.log(err)
})
} else {
this.$refs.uToast.show({
title: '该类型和区域没有的题库',
type: 'warning',
duration: 1500,
callback: () => {
this.showPop = false
},
})
}
})
.catch((err) => {
console.log(err)
})
}
},
changeIndex() {
for (var i = 0; i < this.range.length; i++) {
......
......@@ -44,7 +44,6 @@
>
</view>
</CircleProgress>
<view style="height:600rpx;width:100%"></view>
</view>
<view class="head-view">
<view class="image-view">
......
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