ddd

business/pages/calendarthemeindex/index.js

@@ -1468,5 +1468,5 @@ Page({
     wx.navigateTo({
       url: `/business/pages/calendarclock/index?id=${this.data.id}&tid=${this.data.tid}&sid=${this.data.sid}&clockdate=${clockdate}`
     })
-  }
+  },
 })
\ No newline at end of file

src/components/clockitem/index.js

@@ -223,6 +223,7 @@ Component({
               tid: that.data.tid,
               cid: that.data.clock.id,
             })
+            that.triggerEvent('delActiveDClock')
           }
         },
         fail (res) {
@@ -238,6 +239,7 @@ Component({
           this.triggerEvent('delClock', {
             cid: params.cid
           })
+          this.triggerEvent('delActiveDClock')
         }
       })
     },

src/pages/calendarthemeindex/index.js

@@ -479,8 +479,8 @@ Page({
         let fixdate = res.datetime.split(" ")[0] // 定位到日期
         if (nowTime >= startTime && nowTime <= endTime) {
           data.themeStatus = 1; // 进行中
-          if(this.data.d){
-            fixdate = '20'+this.data.d.slice(0,2)+'-'+this.data.d.slice(2,4)+'-'+this.data.d.slice(4,6)
+          if (this.data.d) {
+            fixdate = '20' + this.data.d.slice(0, 2) + '-' + this.data.d.slice(2, 4) + '-' + this.data.d.slice(4, 6)
           }
         } else if (nowTime < startTime) {
           // data.operationDate=[]
@@ -489,12 +489,12 @@ Page({
           // enableDays([])
         } else {
           data.themeStatus = 3 // 未已结束
-          if(this.data.d){
-            fixdate = '20'+this.data.d.slice(0,2)+'-'+this.data.d.slice(2,4)+'-'+this.data.d.slice(4,6)
-          }else{
+          if (this.data.d) {
+            fixdate = '20' + this.data.d.slice(0, 2) + '-' + this.data.d.slice(2, 4) + '-' + this.data.d.slice(4, 6)
+          } else {
             fixdate = data.calendar_set.end_time.split(" ")[0]
           }
-          
+
           // data.operationDate=[startD,endD]
         }
         if (this.numberDate(startD) == this.numberDate(endD)) {
@@ -999,8 +999,7 @@ Page({
       }
     }
   },
-  shareFriend() {
-  },
+  shareFriend() {},
   // generatePoster () {
   // },
   // 设置昵称相关
@@ -1728,7 +1727,7 @@ Page({
       activeDay: _activeDay,
       hasmore: true,
       clockPage: 1
-    },()=>{
+    }, () => {
       this.clockListGet('init');
       this.selfClockGet();
     })
@@ -1813,7 +1812,7 @@ Page({
       hasmore: true,
       clockPage: 1
     })
- 
+
   },
   compareTime(date1, date2, type) {
     // date2比date1大
@@ -2375,5 +2374,11 @@ Page({
         }
       })
     })
+  },
+  // 删除打卡
+  delActiveDClock() {
+    this.setData({
+      "activeDay.isClock": false
+    })
   }
 })
\ No newline at end of file

src/pages/calendarthemeindex/index.wxml

@@ -262,7 +262,7 @@
                     headerclick="{{true}}" bind:playvoice="playvoice" bind:pausevoice="pausevoice"
                     bind:voiceslide="voiceslide" audioStorage="{{audioStorage}}" bind:slidestart="slidestart"
                     bind:slideend="slideend" bind:videoplay="videoplay" bind:delEvaluate="selfDelEvaluate"
-                    bind:showcommenteditor="showcommenteditor" bind:playvideo="playvideo">
+                    bind:showcommenteditor="showcommenteditor" bind:playvideo="playvideo" bind:delActiveDClock="delActiveDClock">
                 </clock-item>
             </view>
             <view class="sign-count-box" hover-class="none" hover-stop-propagation="false">