Commit 09badb60 authored by Damon's avatar Damon

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

parents 24bc7508 4af5c411
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
:loading="loading" :loading="loading"
@click="handleClickSure" @click="handleClickSure"
> >
{{ buttonText }} 确定
</u-button> </u-button>
</view> </view>
</view> </view>
...@@ -61,11 +61,6 @@ export default { ...@@ -61,11 +61,6 @@ export default {
type: String, type: String,
default: '', default: '',
}, },
buttonText: {
// 确定按钮
type: String,
default: '确定',
},
}, },
data() { data() {
return { return {
......
...@@ -130,13 +130,13 @@ export default { ...@@ -130,13 +130,13 @@ export default {
return this.learnData.institutionName || '模考大师' return this.learnData.institutionName || '模考大师'
}, },
maxpoint() { maxpoint() {
return this.learnData.maxPoint > 0 && this.learnData.maxPoint || '' return String(this.learnData.startDate).length > 0 ? this.learnData.maxPoint : ''
}, },
learnTime() { learnTime() {
return this.learnData.maxPoint > 0 && this.learnData.time || '' return String(this.learnData.startDate).length > 0 ? this.learnData.time : ''
}, },
resultForTest() { resultForTest() {
return this.learnData.maxPoint > 0 && ((this.learnData.maxPoint > 80 && '合格') || '不合格') || '' return String(this.learnData.startDate).length > 0 ? ((this.learnData.maxPoint > 80 && '合格') || '不合格') : ''
}, },
}, },
methods: { methods: {
......
...@@ -257,4 +257,7 @@ page { ...@@ -257,4 +257,7 @@ page {
background-color: white; */ background-color: white; */
} }
} }
::v-deep u-cell-item .u-cell {
padding: 35rpx 32rpx !important;
}
</style> </style>
...@@ -52,26 +52,6 @@ ...@@ -52,26 +52,6 @@
</view> </view>
</view> </view>
</picker> </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>
<view class="bottom-view"> <view class="bottom-view">
<u-button <u-button
...@@ -80,6 +60,7 @@ ...@@ -80,6 +60,7 @@
shape="circle" shape="circle"
:disabled="buttonDisabled" :disabled="buttonDisabled"
:type="buttonDisabled ? '' : 'primary'" :type="buttonDisabled ? '' : 'primary'"
throttle-time="250"
> >
确定 确定
</u-button> </u-button>
...@@ -233,8 +214,8 @@ export default { ...@@ -233,8 +214,8 @@ export default {
console.log(res) console.log(res)
this.range = res || [] this.range = res || []
}, },
async handleClickSubmit() { handleClickSubmit() {
if (this.buttonDisabled) return // if (this.buttonDisabled) return
if (this.range.length <= 0 || this.range.length == null) { if (this.range.length <= 0 || this.range.length == null) {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '该类型和区域没有的题库', title: '该类型和区域没有的题库',
...@@ -246,6 +227,7 @@ export default { ...@@ -246,6 +227,7 @@ export default {
}) })
return return
} }
if (this.index == 0) { if (this.index == 0) {
this.changeIndex() this.changeIndex()
} }
...@@ -254,18 +236,18 @@ export default { ...@@ -254,18 +236,18 @@ export default {
type: this.selectedTypeId, type: this.selectedTypeId,
} }
// 获取科目对应的题库 // 获取科目对应的题库
let res = await this.$u.api.getQuestionWarehouse(this.category.id, param) this.$u.api
.getQuestionWarehouse(this.category.id, param)
.then((res) => {
if (res && res.length > 0) { if (res && res.length > 0) {
let data = res[0] let data = res[0]
// 学员增加自己的题库 // 学员增加自己的题库
let result = await this.$u.api this.$u.api
.addQuestionWarehouse({ .addQuestionWarehouse({
questionWarehouseId: data.id, questionWarehouseId: data.id,
}) })
.catch((err) => { .then((result) => {
console.log(err)
})
if (result) { if (result) {
data.isAdd = true data.isAdd = true
this.setPageInfo(data) this.setPageInfo(data)
...@@ -284,6 +266,11 @@ export default { ...@@ -284,6 +266,11 @@ export default {
} else { } else {
this.showPop = false this.showPop = false
} }
})
.catch((err) => {
this.showPop = false
console.log(err)
})
} else { } else {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '该类型和区域没有的题库', title: '该类型和区域没有的题库',
...@@ -294,6 +281,10 @@ export default { ...@@ -294,6 +281,10 @@ export default {
}, },
}) })
} }
})
.catch((err) => {
console.log(err)
})
}, },
changeIndex() { changeIndex() {
for (var i = 0; i < this.range.length; i++) { for (var i = 0; i < this.range.length; i++) {
......
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
> >
</view> </view>
</CircleProgress> </CircleProgress>
<view style="height:600rpx;width:100%"></view>
</view> </view>
<view class="head-view"> <view class="head-view">
<view class="image-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