fix

pages/fundDetails.vue

@@ -149,7 +149,6 @@
            // this.listSign[i].employeeName = this.listSign[i].employeeName + " ";
          }
          this.checked = checked;
-         console.log("123", checked)
        },
        allPay() {
          let arr = [];

pages/index.vue

@@ -116,7 +116,7 @@
 						 点名人数
 					 </view>
 					 <view class="num">
-						 {{task.signNum}}
+						 {{task.signNum + task.noSignNum}}
 					 </view>
 				 </view>
 			 </view>
@@ -232,8 +232,18 @@
 			 var strArray = str.split(" ");
 			 var strDate = strArray[0].split("-");
 			 // var strTime = strArray[1].split(":");
-			 var d = new Date(strDate[0],(strDate[1]-parseInt(1)),strDate[2]);
+			 var taskFinishTime = new Date(strDate[0], (strDate[1]-parseInt(1)), (strDate[2]));//任务结束的晚上0点
-			 return d > new Date() ? "进行中" : "已结束"
+			 taskFinishTime.setDate(taskFinishTime.getDate() + 1);
+
+			 // console.log("date", taskFinishTime, this.getTomorrowZeroTime())
+			 return new Date() > taskFinishTime ? "已结束" : "进行中"
+		 },
+		 getTomorrowZeroTime() {
+			const now = new Date(); // 获取当前时间
+			const tomorrow = new Date(now); // 复制当前时间对象
+			tomorrow.setDate(now.getDate() + 1); // 日期加1，得到明天
+			tomorrow.setHours(0, 0, 0, 0); // 将小时、分钟、秒和毫秒都设置为0
+			return tomorrow;
 		},
 		 getList() {
 			 if (this.showNoMore && this.queryParams.pageNum > 1){
@@ -557,7 +567,7 @@
 
 					.name-status{
 						display: flex;
-						align-items: flex-start;
+						align-items: center;
 						.task-name{
 							font-size: 33rpx;
 							font-weight: 590;
@@ -569,8 +579,8 @@
 
 						.status-base{
 							margin-left: 5rpx;
-							width: 50rpx;
+							width: 80rpx;
-							height: 20rpx;
+							height: 30rpx;
 							background-size: 100% 100%;
 						}
 

pages/taskDetails.vue

@@ -24,7 +24,7 @@
              </view>
              <view class="no-num">
                  <view class="num">
-                     {{task.baomingNum - task.signNum}}
+                     {{task.noSignNum}}
                  </view>
                  <view class="num-label">
                      未到人数
@@ -43,7 +43,7 @@
         </view>
     </view>
     <view class="list">
-        <view v-for="(item, index) in showSign"  :key="index" class="item" :class="item.status == 1 ? 'item-check' : 'item-noCheck'" @click="setInfo(item)">
+        <view v-for="(item, index) in showSign"  :key="index" class="item" :class="'item-check' + item.status" @click="setInfo(item)">
 
 <!--            <view class="status">-->
 <!--                <uni-icons v-if="item.status == 1" class="icon" color="#11dc03" type="checkbox-filled" size="20" @click="search"></uni-icons>-->
@@ -143,6 +143,7 @@
              this.signInfo = item;
          },
          sign(status){
+		     let oldStatus = this.signInfo.status;
 		    let change = this.signInfo.status != status;
             this.signInfo.status = status;
              setSign(this.signInfo);
@@ -150,8 +151,14 @@
                  if (status == 1){
                      this.task.signNum ++;
                  }else{
+                     this.task.noSignNum ++;
+                 }
+                 if (oldStatus == 0){
+                     this.task.noSignNum --;
+                 }else if (oldStatus == 1){
                      this.task.signNum --;
                  }
+
              }
              this.$refs.popup.close()
          },
@@ -300,14 +307,18 @@
         /*padding: 0rpx 10rpx 10rpx 10rpx;*/
         margin-top: 30rpx;
         place-items: center;
-        .item-check{
+        .item-check1{
             background-size: 100% 100%;
             background-image: url("/static/images/sign/sign.png");
         }
-        .item-noCheck{
+        .item-check0{
             background-size: 100% 100%;
             background-image: url("/static/images/sign/noSign1.png");
         }
+        .item-check-1{
+            background-size: 100% 100%;
+            background-image: url("/static/images/sign/noneSign.png");
+        }
         .item{
             position: relative;
             width: 160rpx;

pages/work/index.vue

@@ -191,7 +191,7 @@
                 <uni-th width="80" align="center">用工姓名</uni-th>
                 <uni-th width="107" align="center">手机号码</uni-th>
                 <uni-th width="80" align="center">发薪状态</uni-th>
-                <uni-th width="80" align="center">实发金额</uni-th>
+<!--                <uni-th width="80" align="center">实发金额</uni-th>-->
                 <uni-th width="80" align="center">应发金额</uni-th>
                 <uni-th width="162" align="center">身份证号</uni-th>
                 <uni-th width="200" align="center">备注</uni-th>
@@ -201,7 +201,7 @@
                 <uni-td width="90" align="center">{{ sign.phone }}</uni-td>
                 <uni-td width="80" align="center"><view class="status"><view :class="'status' + getPayStatus(sign).status"></view></view></uni-td>
                 <uni-td width="80" align="center">{{ sign.stEmployeeFundRecord == null ? 0 : sign.stEmployeeFundRecord.realPrice }}</uni-td>
-                <uni-td width="80" align="center">{{ task.dayPrice }}</uni-td>
+<!--                <uni-td width="80" align="center">{{ task.dayPrice }}</uni-td>-->
                 <uni-td width="162" align="center">{{ sign.idCard }}</uni-td>
                 <uni-td width="200" align="center">{{ sign.remark == null ? "无" : sign.remark}}</uni-td>
                 <!--              <uni-td>-->