Commit 24d37ff8 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 f03885b9 05f29d5b
......@@ -193,7 +193,6 @@ export default {
},
methods: {
submit(){
console.log('cert', this.certId)
if(!this.certId){
this.$u.toast('请填写证件号码!')
return
......@@ -206,9 +205,7 @@ export default {
personalCertNum: this.certId,
personalName: this.certName
}
console.log(param)
this.$u.api.getCertFromOut(param).then((res) => {
console.log('证书查询结果', res)
if(!res){
this.$u.toast('证书暂未公布')
return
......@@ -232,7 +229,6 @@ export default {
//获取国家证书数据
getCountryCert(){
this.$u.api.getCountryCertList().then((res)=>{
console.log('国家证',res)
if(!res || res.length == 0){
return
}
......@@ -259,13 +255,11 @@ export default {
}
this.logTime = logDate
this.countryCertList = JSON.parse(JSON.stringify(data))
console.log('list data', this.countryCertList)
})
},
//获取学时数据
getLearnCert(){
this.$u.api.getlearnCertList().then((res)=>{
console.log('学时证', res);
if(!res || res.length == 0){
//空显示缺醒
return
......@@ -284,15 +278,12 @@ export default {
item.key = key
data.push(item)
}
console.log('学时证处理结果', data)
this.learnCertList = JSON.parse(JSON.stringify(data))
})
},
goDetail(param){
console.log('goto param', param)
if(param[0].type == 'learn'){
param = param[0]
console.log('点击学时证,请求详情,组装参数再传过去')
this.$u.api.getlearnCertDetail(param.id).then((res)=>{
param.data = res
getApp().globalData.certItemData = param
......@@ -303,7 +294,6 @@ export default {
console.log(err)
})
}else{
console.log('点击国家证,直接参数带过去', param)
getApp().globalData.certItemData = param
this.$u.route({
url: 'pages/cert/detail',
......@@ -315,10 +305,8 @@ export default {
var oDate2 = new Date(date2)
if(oDate1.getTime() > oDate2.getTime()){
return date1
// console.log('第一个大')
} else {
return date2
// console.log('第二个大')
}
},
actionSheetCallback(index) {
......@@ -337,9 +325,7 @@ export default {
onRestore() {
this.triggered = 'restore' // 需要重置
},
onAbort() {
console.log('onAbort')
},
onAbort() {},
transition(e) {
// swiper-item左右移动,通知tabs的滑块跟随移动
let dx = e.detail.dx
......@@ -358,7 +344,6 @@ export default {
},
//tabs通知swiper切换
tabsChange(index) {
console.log('当前tabs index',index)
this.swiperCurrent = Number(index)
switch (this.swiperCurrent) {
case 1:
......
......@@ -75,7 +75,7 @@
<u-icon name="file-text" color="#5A6073" size="40"></u-icon>
<text>交卷</text>
</view>
<view class="c-list" v-if="type === 4" @click="remove">
<view class="c-list" v-if="type === 4" @click="$u.throttle(remove, 500)">
<u-image
:src="removeImg"
width="36"
......@@ -123,6 +123,8 @@
>
</dailyPop>
</view>
<u-toast ref="uToast" />
</view>
</template>
......@@ -177,11 +179,11 @@ export default {
swiperDuration: '800',
// 分页数据
currentPage: 1,
pageSize: 100,
pageSize: 50,
total: 0,
requesting: false,
// 1.顺序答题 2.随机练习 3.模拟考试 4.收藏答题 5.错题答题 6.专项练习-单选 7.专项练习-多选 8.专项练习-判断 9.专项练习-答案是
source: 1,
source: 5,
recordId: 0,
// 合格分数
passPoint: 60,
......@@ -326,15 +328,24 @@ export default {
this.currentIndex = current
if (current == NO_PREV_PAGE || current == NO_NEXT_PAGE) {
if (this.requesting) {
return this.$u.toast('数据加载中')
return this.$refs.uToast.show({
title: '数据加载中',
type: 'warning',
})
}
if (current == NO_PREV_PAGE) {
return this.$u.toast('已经是第一道试题')
return this.$refs.uToast.show({
title: '已经是第一道试题',
type: 'warning',
})
}
if (current == NO_NEXT_PAGE) {
return this.$u.toast('已经是最后一道试题')
return this.$refs.uToast.show({
title: '已经是最后一道试题',
type: 'warning',
})
}
}
......@@ -498,7 +509,10 @@ export default {
this.$u.vuex(`answerCount.${this.questionWarehouseId}`, 0)
this.$u.vuex(`lastIndex.${this.questionWarehouseId}`, 0)
this.$u.vuex(`questionList.${this.questionWarehouseId}`, [])
return this.$u.toast('您已经答完全部试题')
return this.$refs.uToast.show({
title: '您已经答完全部试题',
type: 'warning',
})
})
}
}
......@@ -514,9 +528,9 @@ export default {
}
return
}
this.$nextTick(() => {
setTimeout(() => {
this.current = this.currentIndex + 1
})
}, 500)
}
},
// 保存答案
......@@ -612,7 +626,10 @@ export default {
this.$u.api[action]({ questionId: info.id }).then((res) => {
if (res) {
const msg = status ? '取消收藏成功' : '收藏成功'
this.$u.toast(msg)
this.$refs.uToast.show({
title: msg,
type: 'success',
})
if (status && this.source === 4) {
this.current = this.currentIndex + 1
}
......@@ -716,7 +733,10 @@ export default {
this.list = list
if (this.list.length === 0) {
this.$u.toast('暂无数据')
this.$refs.uToast.show({
title: '暂无数据',
type: 'error',
})
setTimeout(() => {
this.$u.route({
delta: 1,
......
......@@ -21,7 +21,7 @@
:statusStyle="item.statusStyle"
></my-subject>
</view>
<view class="content" v-else>
<view class="content" v-else style="padding-top: 300rpx;">
<u-image width="374rpx" height="322rpx" :src="nothing"></u-image>
<text style="margin-top: 20rpx;font-size: 28rpx;color: #9EA5BB;"
>当前暂无题库内容</text
......@@ -167,7 +167,7 @@ page {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
/* justify-content: center; */
padding: 30rpx;
height: 100%;
overflow: auto;
......
......@@ -188,7 +188,6 @@ export default {
})
.then((res) => {
uni.hideLoading()
console.log('识别结果', res)
this.student.certificateValidityDate = res.expire
})
.catch((data) => {
......
......@@ -104,6 +104,9 @@ export default {
background-size: 100% 520rpx;
background-repeat: no-repeat;
padding: 0 20rpx;
.search-bar {
margin-top: 20rpx;
}
.title {
color: #191c27;
font-size: 32rpx;
......
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