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 @@
 		</view>
 
 		<view class="bm-bottom">
-			<view class="bm-btn" @click="baoming">报名</view>
+			<view v-if="taskInvalid == 0" class="bm-btn" @click="baoming">报名</view>
+			<view v-else class="bm-btn-invalid">任务已失效</view>
+
 		</view>
 	</view>
 
@@ -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 @@
 			 </view>
 
 			 <view class="item-container" @click="tabChange(2)">
-				 <view class="item" style="width: 120rpx">
+				 <view class="item" style="width: 170rpx">
 					 <view :class="nowTab == 2 ? 'tab-title-focus' : 'tab-title'">
 						 我的任务
 					 </view>
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