From 3da6b1e759a1101d301cd021e3fdaabc79afb5ff Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Thu, 25 Feb 2021 16:14:42 +0800
Subject: [PATCH] =?UTF-8?q?1.6.25=20=E4=BF=AE=E5=A4=8Dmodulelist=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E8=AF=A6=E6=83=85;=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/toRegister/toRegister.js                |  2 +-
 .../pages/moduleList/moduleList.js            | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index d3093d3..1051f25 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.6.24"
+    const versionNum = "1.6.25"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag
diff --git a/subpages/oneKeyService/pages/moduleList/moduleList.js b/subpages/oneKeyService/pages/moduleList/moduleList.js
index b81fdc3..f70c72d 100644
--- a/subpages/oneKeyService/pages/moduleList/moduleList.js
+++ b/subpages/oneKeyService/pages/moduleList/moduleList.js
@@ -50,15 +50,17 @@ Page({
       this.getNoticelist()
     } else if (this.getModuleStyleType() == 'module_list') {
       this.getModuleCategory()
-    } else if (options.modulestyle == '4') {
-      wx.navigateTo({
-        url: `../noticeDetail/noticeDetail?pid=${this.data.moduleInfo.pid}&bannerflag=${this.data.moduleInfo.bannerflag}&categorycode=${this.data.moduleInfo.categorycode}&modulestyle=${this.data.moduleInfo.modulestyle}&categoryname=${this.data.moduleInfo.categoryname}`
-      })   
     } else if (this.getModuleStyleType() == 'notice_tab_list') {
       this.getModuleCategoryList().then(() => {
         this.getNoticelist(this.data.newsCategoryList[0].value)
       })
-    } 
+    } else {
+      wx.showToast({
+        title: '样式错误',
+        icon: 'none',
+        duration: 2500
+      })
+    }
   },
 
   /**
@@ -100,7 +102,7 @@ Page({
     } else if (moduleStyle == '8') {
       return 'notice_tab_list'
     }
-    return 'notice_list'
+    return 'none'
   },
   //获取模块列表
   getModuleCategory() {
@@ -286,16 +288,15 @@ Page({
    */
   navigateToType (e) {
     const info = e.currentTarget.dataset.info
-    if (info.moduleStyle) {
+    if (info.moduleStyle == '4') {
+      wx.navigateTo({
+        url: `../noticeDetail/noticeDetail?pid=${info.pid}&bannerflag=${info.bannerFlag}&categorycode=${info.categoryCode}&modulestyle=${info.moduleStyle}&categoryname=${info.categoryName}`
+      })
+    }
+    else {
       wx.navigateTo({
         url: `./moduleList?pid=${info.id}&bannerflag=${info.bannerFlag}&categorycode=${info.categoryCode}&modulestyle=${info.moduleStyle}&categoryname=${info.categoryName}`
       })      
-    } else {
-      wx.showToast({
-        title: '该模块未选择展示形式',
-        icon: 'none',
-        duration: 2000
-      })
     }
   },