Commit 05f29d5b authored by Damon's avatar Damon

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

parents d6943d70 0373aabd
...@@ -44,14 +44,15 @@ export default { ...@@ -44,14 +44,15 @@ export default {
}, },
computed: { computed: {
examTypeText() { examTypeText() {
return this.info.echoMap && this.info.echoMap.type var str = this.info.echoMap && this.info.echoMap.type
return str || ''
}, },
provinceName() { provinceName() {
return ( var str =
this.info.echoMap && this.info.echoMap &&
this.info.echoMap.provinceId && this.info.echoMap.provinceId &&
this.info.echoMap.provinceId.fullName this.info.echoMap.provinceId.fullName
) return str || ''
}, },
isAdd() { isAdd() {
return this.type == 'add' return this.type == 'add'
......
...@@ -127,13 +127,13 @@ export default { ...@@ -127,13 +127,13 @@ export default {
return this.learnData.institutionName || '模考大师' return this.learnData.institutionName || '模考大师'
}, },
maxpoint() { maxpoint() {
return String(this.learnData.startDate).length > 0 ? this.learnData.maxPoint : '' return this.learnData.maxPoint || ''
}, },
learnTime() { learnTime() {
return String(this.learnData.startDate).length > 0 ? this.learnData.time : '' return String(this.learnData.startDate).length > 0 ? this.learnData.time : ''
}, },
resultForTest() { resultForTest() {
return String(this.learnData.startDate).length > 0 ? ((this.learnData.maxPoint >= 80 && '合格') || '不合格') : '' return this.learnData.maxPoint ? ((this.learnData.maxPoint >= 80 && '合格') || '不合格') : ''
}, },
}, },
methods: { methods: {
...@@ -159,7 +159,8 @@ export default { ...@@ -159,7 +159,8 @@ export default {
.begin-answer { .begin-answer {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: #2953ff; background-image: linear-gradient(to top, #22222E 0%, #444550 40%);
background-color: #22222E;
background-size: 100% 920rpx; background-size: 100% 920rpx;
background-repeat: no-repeat; background-repeat: no-repeat;
height: 100vh; height: 100vh;
......
...@@ -193,7 +193,6 @@ export default { ...@@ -193,7 +193,6 @@ export default {
}, },
methods: { methods: {
submit(){ submit(){
console.log('cert', this.certId)
if(!this.certId){ if(!this.certId){
this.$u.toast('请填写证件号码!') this.$u.toast('请填写证件号码!')
return return
...@@ -206,9 +205,7 @@ export default { ...@@ -206,9 +205,7 @@ export default {
personalCertNum: this.certId, personalCertNum: this.certId,
personalName: this.certName personalName: this.certName
} }
console.log(param)
this.$u.api.getCertFromOut(param).then((res) => { this.$u.api.getCertFromOut(param).then((res) => {
console.log('证书查询结果', res)
if(!res){ if(!res){
this.$u.toast('证书暂未公布') this.$u.toast('证书暂未公布')
return return
...@@ -232,7 +229,6 @@ export default { ...@@ -232,7 +229,6 @@ export default {
//获取国家证书数据 //获取国家证书数据
getCountryCert(){ getCountryCert(){
this.$u.api.getCountryCertList().then((res)=>{ this.$u.api.getCountryCertList().then((res)=>{
console.log('国家证',res)
if(!res || res.length == 0){ if(!res || res.length == 0){
return return
} }
...@@ -259,13 +255,11 @@ export default { ...@@ -259,13 +255,11 @@ export default {
} }
this.logTime = logDate this.logTime = logDate
this.countryCertList = JSON.parse(JSON.stringify(data)) this.countryCertList = JSON.parse(JSON.stringify(data))
console.log('list data', this.countryCertList)
}) })
}, },
//获取学时数据 //获取学时数据
getLearnCert(){ getLearnCert(){
this.$u.api.getlearnCertList().then((res)=>{ this.$u.api.getlearnCertList().then((res)=>{
console.log('学时证', res);
if(!res || res.length == 0){ if(!res || res.length == 0){
//空显示缺醒 //空显示缺醒
return return
...@@ -284,15 +278,12 @@ export default { ...@@ -284,15 +278,12 @@ export default {
item.key = key item.key = key
data.push(item) data.push(item)
} }
console.log('学时证处理结果', data)
this.learnCertList = JSON.parse(JSON.stringify(data)) this.learnCertList = JSON.parse(JSON.stringify(data))
}) })
}, },
goDetail(param){ goDetail(param){
console.log('goto param', param)
if(param[0].type == 'learn'){ if(param[0].type == 'learn'){
param = param[0] param = param[0]
console.log('点击学时证,请求详情,组装参数再传过去')
this.$u.api.getlearnCertDetail(param.id).then((res)=>{ this.$u.api.getlearnCertDetail(param.id).then((res)=>{
param.data = res param.data = res
getApp().globalData.certItemData = param getApp().globalData.certItemData = param
...@@ -303,7 +294,6 @@ export default { ...@@ -303,7 +294,6 @@ export default {
console.log(err) console.log(err)
}) })
}else{ }else{
console.log('点击国家证,直接参数带过去', param)
getApp().globalData.certItemData = param getApp().globalData.certItemData = param
this.$u.route({ this.$u.route({
url: 'pages/cert/detail', url: 'pages/cert/detail',
...@@ -315,10 +305,8 @@ export default { ...@@ -315,10 +305,8 @@ export default {
var oDate2 = new Date(date2) var oDate2 = new Date(date2)
if(oDate1.getTime() > oDate2.getTime()){ if(oDate1.getTime() > oDate2.getTime()){
return date1 return date1
// console.log('第一个大')
} else { } else {
return date2 return date2
// console.log('第二个大')
} }
}, },
actionSheetCallback(index) { actionSheetCallback(index) {
...@@ -337,9 +325,7 @@ export default { ...@@ -337,9 +325,7 @@ export default {
onRestore() { onRestore() {
this.triggered = 'restore' // 需要重置 this.triggered = 'restore' // 需要重置
}, },
onAbort() { onAbort() {},
console.log('onAbort')
},
transition(e) { transition(e) {
// swiper-item左右移动,通知tabs的滑块跟随移动 // swiper-item左右移动,通知tabs的滑块跟随移动
let dx = e.detail.dx let dx = e.detail.dx
...@@ -358,7 +344,6 @@ export default { ...@@ -358,7 +344,6 @@ export default {
}, },
//tabs通知swiper切换 //tabs通知swiper切换
tabsChange(index) { tabsChange(index) {
console.log('当前tabs index',index)
this.swiperCurrent = Number(index) this.swiperCurrent = Number(index)
switch (this.swiperCurrent) { switch (this.swiperCurrent) {
case 1: case 1:
...@@ -519,7 +504,7 @@ page { ...@@ -519,7 +504,7 @@ page {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 30rpx; padding: 200rpx 30rpx 30rpx 30rpx;
text-align: center; text-align: center;
} }
</style> </style>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<text v-else>{{ title }}</text> <text v-else>{{ title }}</text>
<u-icon class="icon-view" name="arrow-up-fill"></u-icon> <u-icon class="icon-view" name="arrow-up-fill"></u-icon>
</view> </view>
<view>{{ orgIdText }}</view> <view v-if="showOrgId">{{ orgIdText }}</view>
<view v-if="noExam" class="tip-view"> <view v-if="noExam" class="tip-view">
<text>您还未选择题库,请先选择题库</text> <text>您还未选择题库,请先选择题库</text>
</view> </view>
...@@ -90,7 +90,11 @@ ...@@ -90,7 +90,11 @@
</view> </view>
</view> </view>
<view class="bottom-view"> <view class="bottom-view">
<image class="bottom-image" :src="mokaodashiImage"></image> <image
class="bottom-image"
:src="mokaodashiImage"
@click="handleClickBlank"
></image>
<view>想要轻松考过,首选模考大师</view> <view>想要轻松考过,首选模考大师</view>
</view> </view>
</view> </view>
...@@ -126,6 +130,8 @@ export default { ...@@ -126,6 +130,8 @@ export default {
finishCount: 0, finishCount: 0,
pass: this.$u.random(95, 99), pass: this.$u.random(95, 99),
isAdd: false, // 题库切换 isAdd: false, // 题库切换
tapCount: 0, // 点击底部logo五次,显示机构id
showOrgId: false, // 显示机构id
} }
}, },
computed: { computed: {
...@@ -566,6 +572,17 @@ export default { ...@@ -566,6 +572,17 @@ export default {
}, },
}) })
}, },
handleClickBlank() {
this.tapCount++
if (this.tapCount >= 5) {
this.showOrgId = !this.showOrgId
this.tapCount = 0
} else if (this.tapCount == 1) {
setTimeout(() => {
this.tapCount = 0
}, 3000)
}
},
}, },
} }
</script> </script>
......
...@@ -21,13 +21,8 @@ ...@@ -21,13 +21,8 @@
:statusStyle="item.statusStyle" :statusStyle="item.statusStyle"
></my-subject> ></my-subject>
</view> </view>
<view class="content" v-else> <view class="content" v-else style="padding-top: 300rpx;">
<u-image <u-image width="374rpx" height="322rpx" :src="nothing"></u-image>
width="374rpx"
height="322rpx"
:src="nothing"
style="margin-top: 100rpx;"
></u-image>
<text style="margin-top: 20rpx;font-size: 28rpx;color: #9EA5BB;" <text style="margin-top: 20rpx;font-size: 28rpx;color: #9EA5BB;"
>当前暂无题库内容</text >当前暂无题库内容</text
> >
...@@ -162,7 +157,7 @@ page { ...@@ -162,7 +157,7 @@ page {
background-color: #f7f9fc; background-color: #f7f9fc;
background-size: 100% 920rpx; background-size: 100% 920rpx;
background-repeat: no-repeat; background-repeat: no-repeat;
height: 120vh; height: 100vh;
position: absolute; position: absolute;
top: 0; top: 0;
width: 100%; width: 100%;
...@@ -172,8 +167,10 @@ page { ...@@ -172,8 +167,10 @@ page {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; /* justify-content: center; */
padding: 30rpx; padding: 30rpx;
height: 100%;
overflow: auto;
} }
.subject-item { .subject-item {
......
...@@ -188,7 +188,6 @@ export default { ...@@ -188,7 +188,6 @@ export default {
}) })
.then((res) => { .then((res) => {
uni.hideLoading() uni.hideLoading()
console.log('识别结果', res)
this.student.certificateValidityDate = res.expire this.student.certificateValidityDate = res.expire
}) })
.catch((data) => { .catch((data) => {
......
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