From ed0978dee994ab7bee799a01d95783d27c9d2cf9 Mon Sep 17 00:00:00 2001
From: mx <1289317512@qq.com>
Date: Wed, 13 Nov 2024 11:24:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E4=BB=BB=E5=8A=A1=E5=A4=B1?=
=?UTF-8?q?=E6=95=88=E5=88=A4=E6=96=AD=EF=BC=8C=E6=88=91=E7=9A=84=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=E6=8D=A2=E8=A1=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config.js | 2 +-
pages/baoming.vue | 37 +++++++++++++++++++++++++++++--
pages/components/employeeTask.vue | 2 +-
pages/components/merchantTask.vue | 2 +-
pages/taskDetails.vue | 2 +-
5 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/config.js b/config.js
index b7e42b0..cc8b10b 100644
--- a/config.js
+++ b/config.js
@@ -1,6 +1,6 @@
// 应用全局配置
module.exports = {
- // baseUrl: 'http://192.168.18.69:8080',
+ // baseUrl: 'http://192.168.18.211:8080',
// baseUrl: 'http://8.155.21.176/prod-api',
baseUrl: 'https://www.tulkj.cn/prod-api',
// 应用信息
diff --git a/pages/baoming.vue b/pages/baoming.vue
index e2a6326..74f7dc2 100644
--- a/pages/baoming.vue
+++ b/pages/baoming.vue
@@ -26,7 +26,9 @@
- 报名
+ 报名
+ 任务已失效
+
@@ -44,9 +46,12 @@
taskId: null,
employeeName: null,
phone: null,
- idCard: null
+ idCard: null,
+
},
q: null,
+ taskInvalid: 0, //0有效 1失效
+ taskInfo: {}
};
},
onLoad: function(query) {
@@ -88,9 +93,24 @@
getTask(){
getTask(this.param).then(response => {
this.param.taskName = response.data.taskName
+ var status = this.toDate(response.data.taskDate)
+ this.taskInfo = response.data.status + "_" + response.data.taskDate + "_" + status;
+ if (response.data.status == 0 || status == 1){
+ this.taskInvalid = 1;
+ }
})
},
+ toDate(str){
+ var strArray = str.split(" ");
+ var strDate = strArray[0].split("-");
+ // var strTime = strArray[1].split(":");
+ var taskFinishTime = new Date(strDate[0], (strDate[1] - parseInt(1)), (strDate[2]));//任务结束的晚上0点
+ taskFinishTime.setDate(taskFinishTime.getDate() + 1);
+
+ // console.log("date", taskFinishTime, this.getTomorrowZeroTime())
+ return new Date() > taskFinishTime ? 1 : 0
+ },
baoming(){
console.log(this.param.employeeName)
var that = this;
@@ -199,6 +219,19 @@
text-align: center;
place-items: center;
}
+ .bm-btn-invalid{
+ left: 0;
+ display: grid;
+ width: 100%;
+ background-color: #7b7b7b;
+ color: #ffffff;
+ font-weight: 650;
+ font-size: 30rpx;
+ border-radius: 7rpx;
+ height: 80rpx;
+ text-align: center;
+ place-items: center;
+ }
}
diff --git a/pages/components/employeeTask.vue b/pages/components/employeeTask.vue
index 1b941c5..8d1e824 100644
--- a/pages/components/employeeTask.vue
+++ b/pages/components/employeeTask.vue
@@ -19,7 +19,7 @@
-
+
我的任务
diff --git a/pages/components/merchantTask.vue b/pages/components/merchantTask.vue
index a91c860..d63b3a0 100644
--- a/pages/components/merchantTask.vue
+++ b/pages/components/merchantTask.vue
@@ -212,7 +212,7 @@
var strArray = str.split(" ");
var strDate = strArray[0].split("-");
// var strTime = strArray[1].split(":");
- var taskFinishTime = new Date(strDate[0], (strDate[1]-parseInt(1)), (strDate[2]));//任务结束的晚上0点
+ var taskFinishTime = new Date(strDate[0], (strDate[1] - parseInt(1)), (strDate[2]));//任务结束的晚上0点
taskFinishTime.setDate(taskFinishTime.getDate() + 1);
// console.log("date", taskFinishTime, this.getTomorrowZeroTime())
diff --git a/pages/taskDetails.vue b/pages/taskDetails.vue
index 0b870ed..483c997 100644
--- a/pages/taskDetails.vue
+++ b/pages/taskDetails.vue
@@ -131,7 +131,7 @@
getTaskDetails(this.queryParams).then(response => {
console.log(response)
that.task = response.data;
- that.showSign= that.task.listSign;
+ that.showSign = that.task.listSign;
let title = "【"+ that.task.taskName +"】人员详情";
uni.setNavigationBarTitle({
title: title