diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue index bb2d11c..17282cd 100644 --- a/components/task/taskItem.vue +++ b/components/task/taskItem.vue @@ -193,7 +193,9 @@ // this.navTo('/subpkg/fileTask/fileTask?id=' + JSON.stringify(this.$props.datas?.extend?.informationg?.arr)) this.navTo(`/subpkg/property/vehicle?task_id=${this.$props.datas?.id}`) } else if (this.$props.datas.type == 33) { - this.navTo(`/subpkg/blockTransaction/blockTransaction?task_id=${this.$props.datas?.id}`) + let is_show = true; + if(uni.$u.timeFormat(Date.now(), 'yyyy-mm-dd')!=this.$props.datas?.end_time) is_show = false; + this.navTo(`/subpkg/blockTransaction/blockTransaction?task_id=${this.$props.datas?.id}&is_show=${is_show}`) } else if (this.$props.datas.type == 34) { this.navTo(`/subpkg/otherTask/otherTask?task_id=${this.$props.datas?.id}`) } else if (this.$props.datas.type == 35) { diff --git a/subpkg/blockTransaction/blockTransaction.vue b/subpkg/blockTransaction/blockTransaction.vue index c4f4317..368846e 100644 --- a/subpkg/blockTransaction/blockTransaction.vue +++ b/subpkg/blockTransaction/blockTransaction.vue @@ -94,6 +94,7 @@ export default { } }, onLoad (options) { + options.is_show ? this.card.is_show = options.is_show : null; options.task_id ? this.task_id = options.task_id : null; this.initLoad(); },