Authored by 王涛

Merge branch 'wuhl-master' into 'master'

Wuhl master



See merge request !10
@@ -82,7 +82,7 @@ export default { @@ -82,7 +82,7 @@ export default {
82 var that = this 82 var that = this
83 // 获取当前系统时间 83 // 获取当前系统时间
84 var myDate = new Date(); 84 var myDate = new Date();
85 - that.dateTime = myDate.getFullYear() + '-' + that.timeFormat(myDate.getMonth() + 1 + '') + '-' + that.timeFormat(myDate.getDate() + '') + ' ' + that.timeFormat(myDate.getHours() + '') + ':' + that.timeFormat(myDate.getMinutes() + '') + ':' + that.timeFormat(myDate.getSeconds() + ''); 85 + that.dateTime = myDate.getFullYear() + '-' + that.timeFormat(myDate.getMonth() + 1 + '') + '-' + that.timeFormat(myDate.getDate() + '') // + ' ' + that.timeFormat(myDate.getHours() + '') + ':' + that.timeFormat(myDate.getMinutes() + '') + ':' + that.timeFormat(myDate.getSeconds() + '');
86 86
87 window.addEventListener('resize', this.screenAdapter) 87 window.addEventListener('resize', this.screenAdapter)
88 this.screenAdapter() 88 this.screenAdapter()