'bug修改'

src/pages/calendarthemeindex/index.js

@@ -1069,7 +1069,7 @@ Page({
     const clockdate = _activeDay.year + '-' + month + '-' + day;
     if (this.data.themeSelect.my_clock_circle_user) { //
       wx.navigateTo({
-        url: `/src/pages/clockeditor/index?tid=${this.data.themeSelect.id}&sid=${this.data.sid}&cid=0&pagefrom=calendarthemeindex&clockdate=${clockdate}`
+        url: `/src/pages/clockeditor/index?tid=${this.data.tid}&sid=${this.data.sid}&cid=0&pagefrom=calendarthemeindex&clockdate=${clockdate}`
       })
     } else {
       if (this.data.circleInfo.had_password) {
@@ -1078,7 +1078,7 @@ Page({
         })
       } else {
         wx.navigateTo({
-          url: `/src/pages/clockeditor/index?tid=${this.data.themeSelect.id}&sid=${this.data.sid}&cid=0&pagefrom=calendarthemeindex&clockdate=${clockdate}`
+          url: `/src/pages/clockeditor/index?tid=${this.data.tid}&sid=${this.data.sid}&cid=0&pagefrom=calendarthemeindex&clockdate=${clockdate}`
         })
       }
     }

src/pages/morethemeindex/index.js

@@ -929,13 +929,20 @@ Page({
   },
 
   goClock(e) {
-    console.log('打卡',this.data.moreTheme.isClockTime,this.data.moreTheme.max_clock_count , this.data.themeSelect.my_clock_count)
     if (!this.data.moreTheme.isClockTime) {
       return false;
     }
     if (this.data.moreTheme.max_clock_count - this.data.themeSelect.my_clock_count <= 0) {
       return false;
     }
+    if (!this.data.themeSelect.id) {
+      wx.showToast({
+        title: '数据加载中，请稍等...',
+        duration: 500,
+        icon: 'none'
+      })
+      return;
+    }
     if (this.data.themeSelect.my_clock_circle_user) { // 
       wx.navigateTo({
         url: `/src/pages/clockeditor/index?sid=${this.data.sid}&tid=${this.data.tid}&pagefrom=morethemeindex&sub=${this.data.themeSelect.id}`

src/pages/themeindex/index.js

@@ -983,7 +983,7 @@ Page({
     } else {
       if (this.data.themeSelect.my_clock_circle_user) { // 
         wx.navigateTo({
-          url: `/src/pages/clockeditor/index?tid=${this.data.themeSelect.id}&cid=0&sid=${this.data.sid}`
+          url: `/src/pages/clockeditor/index?tid=${this.data.tid}&cid=0&sid=${this.data.sid}`
         })
       } else {
         if (this.data.circleInfo.had_password) {
@@ -992,7 +992,7 @@ Page({
           })
         } else {
           wx.navigateTo({
-            url: `/src/pages/clockeditor/index?tid=${this.data.themeSelect.id}&cid=0&sid=${this.data.sid}`
+            url: `/src/pages/clockeditor/index?tid=${this.data.tid}&cid=0&sid=${this.data.sid}`
           })
         }
       }