From ee2d7ec6772c4d9882d81289e41d1859051dbc22 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Fri, 11 Sep 2020 16:49:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E7=A0=81=E9=94=A6=E6=B0=B4?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=94=A6=E6=B0=B4=E5=AF=BC=E8=88=AA=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpages/understandJs/pages/index/index.js               | 4 ++++
 subpages/understandJs/pages/noticeDetail/noticeDetail.js | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/subpages/understandJs/pages/index/index.js b/subpages/understandJs/pages/index/index.js
index 2eb502b..6bccb8a 100644
--- a/subpages/understandJs/pages/index/index.js
+++ b/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}`
+      })
     }
   }
 })
\ No newline at end of file
diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.js b/subpages/understandJs/pages/noticeDetail/noticeDetail.js
index 684cd29..5741b70 100644
--- a/subpages/understandJs/pages/noticeDetail/noticeDetail.js
+++ b/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: "锦水警事" 

From f4381fe0768b9c4be588f1e8dc3fa55b0887077c Mon Sep 17 00:00:00 2001
From: lihenian <2629534615@qq.com>
Date: Fri, 11 Sep 2020 17:10:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=88=E6=9C=AC1.4.36=20=E8=A7=A3?=
 =?UTF-8?q?=E7=A0=81=E9=94=A6=E6=B0=B4=E4=B8=AD=E5=A2=9E=E5=8A=A0=E9=94=A6?=
 =?UTF-8?q?=E6=B0=B4=E5=AF=BC=E8=88=AA=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/toRegister/toRegister.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index cb0be74..955ef19 100644
--- a/pages/toRegister/toRegister.js
+++ b/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