|
|
@@ -188,18 +188,19 @@ export default {
|
|
|
isShowFun(times) {
|
|
|
var timestamp = parseInt(new Date().getTime() / 1000);
|
|
|
var newDataAge = parseInt(new Date(new Date().toLocaleDateString()).getTime() / 1000);
|
|
|
- if (times.applyEndTime < timestamp) {
|
|
|
+ if (times.applyEndTime <= timestamp) {
|
|
|
return false;
|
|
|
} else {
|
|
|
if (times.beforeStatus === 1) {
|
|
|
return false;
|
|
|
- } else if (times.examStatus !== 0) {
|
|
|
+ } else
|
|
|
+ if (times.examStatus !== 0) {
|
|
|
return false;
|
|
|
- } else if (times.applySiteExamTime < times.newDataAge) {
|
|
|
- return false;
|
|
|
- } else if (times.applySiteExamTime > times.newDataAge) {
|
|
|
+ } else if (times.applySiteExamTime < newDataAge) {
|
|
|
return true;
|
|
|
- } else if (times.applySiteExamTime == times.newDataAge) {
|
|
|
+ } else if (times.applySiteExamTime > newDataAge) {
|
|
|
+ return false;
|
|
|
+ } else if (times.applySiteExamTime == newDataAge) {
|
|
|
var hours = new Date().getHours();
|
|
|
var mins = new Date().getMinutes();
|
|
|
var arrays = times.applySiteStartTime.split('-').map(Number);
|
|
|
@@ -230,6 +231,7 @@ export default {
|
|
|
this.details_show = false;
|
|
|
},
|
|
|
submit() {
|
|
|
+ return
|
|
|
var bols = this.isShowFun(this.activeList)
|
|
|
if(!bols){
|
|
|
uni.showToast({
|