Commit a4219333 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 e5bb0f05 585689eb
......@@ -112,7 +112,7 @@ export default {
return this.learnData.startDate || ' '
},
learnDate() {
return this.learnData.startDate + '~' + this.learnData.endDate
return String(this.learnData.startDate).length > 1 && (this.learnData.startDate + '~' + this.learnData.endDate) || ' '
},
name() {
return this.learnData.name || ' '
......@@ -121,7 +121,7 @@ export default {
return this.learnData.idCard || ' '
},
company() {
return this.workPlace
return this.workPlace || ' '
},
subjectName() {
return this.learnData.subjectName || ' '
......
......@@ -277,7 +277,7 @@ export default {
continue
}
let item = {}
item.certificateName = res[key].echoMap.questionWarehouseId.title.replace('作业', '证')
item.certificateName = res[key].echoMap.questionWarehouseId.title
item.id = res[key].echoMap.questionWarehouseId.id
item.bgImage = this.learnCertImage
item.type = 'learn'
......
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