diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/todayTime.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/todayTime.js index 916052f92..d3d379634 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/todayTime.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/todayTime.js @@ -12,6 +12,11 @@ export default { ymdhMins:y+"-"+m.substring(m.length-2,m.length)+"-"+d.substring(d.length-2,d.length) + ' ' + h.substring(h.length-2,h.length) + ':' + min.substring(min.length-2,min.length) + ':' + second.substring(second.length-2,second.length), ymd:y+"-"+m.substring(m.length-2,m.length)+"-"+d.substring(d.length-2,d.length) }; + }, + doHandleYear(obj) { + var myDate = obj? new Date(obj) : new Date(); + var tYear = myDate.getFullYear(); + return tYear; } } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/from.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/from.vue index 376b5e74a..1f233ad13 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/from.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/from.vue @@ -209,7 +209,7 @@ var postqueryData = {}; postqueryData.ArriveDate = todayTime.fmtDate().ymdhMins; postqueryData.RegisterStatus = '1'; - postqueryData.RegisterStatus =this.StuInfoFreshEntity.IsPoor; + postqueryData.IsPoor =this.StuInfoFreshEntity.IsPoor; postqueryData.GetKeyStatus =this.StuInfoFreshEntity.GetKeyStatus; postqueryData.GetCardStatus =this.StuInfoFreshEntity.GetCardStatus; postqueryData.OtherPayFeeStatus =this.StuInfoFreshEntity.OtherPayFeeStatus; diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue index bae827061..41d07fd4c 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue @@ -4,7 +4,7 @@ - 2020 + {{ year }} 新生入校流程 @@ -120,6 +120,7 @@