Commit 0329c8dc authored by Damon's avatar Damon

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

parents da563577 7a420c89
...@@ -48,6 +48,7 @@ export default { ...@@ -48,6 +48,7 @@ export default {
learnData: {}, learnData: {},
certName: [], certName: [],
topImage: process.uniEnv.qn_base_url + 'tezhongzuoyepingtai@2x.png', topImage: process.uniEnv.qn_base_url + 'tezhongzuoyepingtai@2x.png',
logDate: null,
} }
}, },
onLoad: function() { onLoad: function() {
...@@ -55,16 +56,21 @@ export default { ...@@ -55,16 +56,21 @@ export default {
}, },
computed: { computed: {
nowDate() { nowDate() {
var Today = new Date() if (this.logDate) {
let m = Today.getMonth() + 1 console.log('取数据的日期')
let d = Today.getDate() return this.logDate.split(' ')[0].replace('-', '.')
return ( } else {
Today.getFullYear() + var Today = new Date()
'.' + let m = Today.getMonth() + 1
(String(m).length > 1 ? m : '0' + m) + let d = Today.getDate()
'.' + return (
(String(d).length > 1 ? d : '0' + d) Today.getFullYear() +
) '.' +
(String(m).length > 1 ? m : '0' + m) +
'.' +
(String(d).length > 1 ? d : '0' + d)
)
}
}, },
startDate() { startDate() {
return this.learnData.startDate || ' ' return this.learnData.startDate || ' '
...@@ -127,6 +133,7 @@ export default { ...@@ -127,6 +133,7 @@ export default {
countryData[k][key].push(list[key]['filedValue_' + i]) countryData[k][key].push(list[key]['filedValue_' + i])
} }
} }
this.logDate = certData[k].logDate || null
} }
this.certName = certName this.certName = certName
this.dataList = countryData this.dataList = countryData
......
...@@ -143,6 +143,7 @@ export default { ...@@ -143,6 +143,7 @@ export default {
name: '我的证书', name: '我的证书',
}, },
], ],
logTime: null,
certType: '', certType: '',
certId: '', certId: '',
certName: '', certName: '',
...@@ -182,13 +183,13 @@ export default { ...@@ -182,13 +183,13 @@ export default {
this.checkType = '特种作业操作证查询' this.checkType = '特种作业操作证查询'
}, },
onShow: function(param) { onShow: function(param) {
try { // try {
if (param.tabs) { // if (param.tabs) {
this.current = param.tabs // this.current = param.tabs
this.swiperCurrent = param.tabs // this.swiperCurrent = param.tabs
} // }
} catch (e) {} // } catch (e) {}
this.tabsChange(this.current) // this.tabsChange(this.current)
}, },
methods: { methods: {
submit(){ submit(){
...@@ -237,21 +238,28 @@ export default { ...@@ -237,21 +238,28 @@ export default {
} }
this.isEmptyList = true this.isEmptyList = true
let data = [] let data = []
let logDate = '2000-01-01 00:00:00'
for(let key in res){ for(let key in res){
//判断是否是table数据格式,否则暂不展示,后面如果有再补充显示图片格式 //判断是否是table数据格式,否则暂不展示,后面如果有再补充显示图片格式
if( if(
Number(res[key].certificateType) != 2){ Number(res[key].certificateType) != 2){
continue continue
} }
//获取最新查询时间当做最近登录查询时间
this.logTime = this.compareDate(logDate,res[key].updateTime)
let item = {} let item = {}
item.certificateName = res[key].certificateName.replace('作业', '证') item.certificateName = res[key].certificateName.replace('作业', '证')
item.bgImage = this.countryCertImage item.bgImage = this.countryCertImage
item.type = 'country' item.type = 'country'
item.key = key item.key = key
item.data = res[key] //传给详情页 item.data = res[key] //传给详情页
item.logDate = this.logTime
data.push(item) data.push(item)
} }
this.logTime = logDate
this.countryCertList = JSON.parse(JSON.stringify(data)) this.countryCertList = JSON.parse(JSON.stringify(data))
console.log('list data', this.countryCertList)
}) })
}, },
//获取学时数据 //获取学时数据
...@@ -302,6 +310,17 @@ export default { ...@@ -302,6 +310,17 @@ export default {
}) })
} }
}, },
compareDate(date1,date2){
var oDate1 = new Date(date1)
var oDate2 = new Date(date2)
if(oDate1.getTime() > oDate2.getTime()){
return date1
// console.log('第一个大')
} else {
return date2
// console.log('第二个大')
}
},
actionSheetCallback(index) { actionSheetCallback(index) {
this.value = this.actionSheetList[index].text this.value = this.actionSheetList[index].text
}, },
......
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