''

src/pages/mynews/index.js

@@ -419,8 +419,14 @@ Page({
   },
   goThemeDetail(e){
     this.themeNoticeRead(e.currentTarget.dataset.tid)
-    wx.navigateTo({
-      url: `/src/pages/themeindex/index?id=${e.currentTarget.dataset.id}&tid=${e.currentTarget.dataset.tid}`,
-    })
+    if (e.currentTarget.dataset.subjecttype == 1) {
+      wx.navigateTo({
+        url: `/src/pages/themeindex/index?id=${e.currentTarget.dataset.id}&tid=${e.currentTarget.dataset.tid}`
+      })
+    } else if (e.currentTarget.dataset.subjecttype == 2) {
+      wx.navigateTo({
+        url: `/src/pages/calendarthemeindex/index?id=${e.currentTarget.dataset.id}&tid=${e.currentTarget.dataset.tid}`
+      })
+    }
   },
 })
\ No newline at end of file

src/pages/mynews/index.wxml

@@ -48,7 +48,7 @@
       </view>
       <view class="themenotice-container clearfix" wx:if="{{currentType == 1}}">
         <view class="" hover-class="none" hover-stop-propagation="false" wx:if="{{!emptyPage}}">
-          <view class="themenotice-item" hover-class="none" hover-stop-propagation="false"  wx:for="{{noticeList}}" wx:key="{{index}}" bindtap="goThemeDetail" data-id="{{item.class_id}}" data-tid="{{item.id}}">
+          <view class="themenotice-item" hover-class="none" hover-stop-propagation="false"  wx:for="{{noticeList}}" wx:key="{{index}}" bindtap="goThemeDetail" data-subjecttype="{{item.subject_type}}" data-id="{{item.class_id}}" data-tid="{{item.id}}">
               <form report-submit="true" bindsubmit="formIdCreate" class="createidform">
                 <button form-type="submit" class="createidbutton">生成form</button>
               </form>