Merge branch 'release'

pages/toRegister/toRegister.js

@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.4.35"
+    const versionNum = "1.4.36"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag

subpages/understandJs/pages/index/index.js

@@ -85,6 +85,10 @@ Page({
       wx.navigateTo({
         url: `../sclerotia/sclerotia?modulecode=${e.currentTarget.dataset.modulecode}`
       })
+    } else if (e.currentTarget.dataset.modulecode == 'notice_jsdh') {
+      wx.navigateTo({
+        url: `../noticeDetail/noticeDetail?modulecode=${e.currentTarget.dataset.modulecode}`
+      })
     }
   }
 })

subpages/understandJs/pages/noticeDetail/noticeDetail.js

@@ -51,6 +51,14 @@ Page({
         title: '锦水硬核' 
       })
       this.noticeDetail(options.id)
+    } else if(options.modulecode == 'notice_jsdh'){
+      wx.setNavigationBarTitle({
+        title: '锦水导航' 
+      })
+      this.setData({
+        isNeedBanner: false
+      })
+      this.noticelist()
     } else if(options.modulecode == 'notice_warning'){
       wx.setNavigationBarTitle({
         title: "锦水警事"