dd

src/pages/morethemeindex/index.js

@@ -2108,7 +2108,7 @@ Page({
     this.data.clockitemtype = e.currentTarget.dataset.clockitemtype;
     this.setData({
       commentclock: e.detail,
-      commenteditor: true
+      commenteditor: true,
     })
   },
   hidecommenteditor(e) {

src/pages/morethemeindex/index.wxml

@@ -171,7 +171,7 @@
             </view>
             <view class="small-gray-box" ></view>
             <view class="operat-box" 
-                wx:if="{{moreTheme.unlock_rule_type==1}}">
+                wx:if="{{moreTheme.unlock_rule_type==1 && !commenteditor}}">
                 <!-- <view class="hold-text" >
                     该关卡还可挑战 {{moreTheme.max_clock_count-themeSelect.my_clock_count}} 次
                 </view> -->
@@ -183,7 +183,7 @@
                 </view>
             </view>
             <view class="operat-box" 
-                wx:if="{{themeSelect.my_clock_count<=0 && moreTheme.unlock_rule_type==2}}">
+                wx:if="{{themeSelect.my_clock_count<=0 && moreTheme.unlock_rule_type==2 && !commenteditor}}">
                 <!-- <view class="hold-text" wx:if="{{themeSelect.my_unlock_count>0}}">
                     该关卡还可打卡 {{moreTheme.max_clock_count-themeSelect.my_clock_count}} 次
                 </view>

src/pages/websiteindex/index.js

@@ -1591,12 +1591,12 @@ Page({
     switch (item.source_type) {
       case 1:
         wx.navigateTo({
-          url:`/src/pages/themeindex/index?id=${item.class_id}&tid=${item.source_id}`
+          url:`/src/pages/themeindex/index?id=${item.subject_data.class_id}&tid=${item.source_id}`
         })
         break;
       case 2:
         wx.navigateTo({
-          url:`/src/pages/calendarthemeindex/index?id=${item.class_id}&tid=${item.source_id}`
+          url:`/src/pages/calendarthemeindex/index?id=${item.subject_data.class_id}&tid=${item.source_id}`
         })
         break;
       case 3: