diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js
index 43a8843..0d7b80a 100644
--- a/pages/indexNew/indexNew.js
+++ b/pages/indexNew/indexNew.js
@@ -84,6 +84,7 @@ Page({
yjfw: {},
jmjs: {},
sxjs: {},
+ shouye: {},
},
onShow: function () {
if (wx.getStorageSync("token") != "" && wx.getStorageSync("token") != undefined && wx.getStorageSync("token") != null) {
@@ -297,6 +298,11 @@ Page({
this.setData({
yjfw: this.data.yjfw
})
+ } else if (item.categoryCode == 'shouye') {
+ this.data.shouye = { ...item }
+ this.setData({
+ shouye: this.data.shouye
+ })
}
})
}).catch(err => {
@@ -483,6 +489,19 @@ Page({
url: `/subpages/oneKeyService/pages/moduleList/moduleList?pid=${this.data.sxjs.id}&bannerflag=${this.data.sxjs.bannerFlag}&categorycode=${this.data.sxjs.categoryCode}&modulestyle=${this.data.sxjs.moduleStyle}&categoryname=${this.data.sxjs.categoryName}`
})
},
+ //跳转到 页面
+ toShouye () {
+ //如果是 详情样式,直接跳转详情页面
+ if (this.data.shouye.moduleStyle == '4') {
+ wx.navigateTo({
+ url: `/subpages/oneKeyService/pages/noticeDetail/noticeDetail?pid=${this.data.shouye.pid}&bannerflag=${this.data.shouye.bannerFlag}&categorycode=${this.data.shouye.categoryCode}&modulestyle=${this.data.shouye.moduleStyle}&categoryname=${this.data.shouye.categoryName}`
+ })
+ } else {
+ wx.navigateTo({
+ url: `/subpages/oneKeyService/pages/moduleList/moduleList?pid=${this.data.shouye.id}&bannerflag=${this.data.shouye.bannerFlag}&categorycode=${this.data.shouye.categoryCode}&modulestyle=${this.data.shouye.moduleStyle}&categoryname=${this.data.shouye.categoryName}`
+ })
+ }
+ },
//跳转到 一键服务页面(新) 2020.07.15
toOneKeyService () {
wx.navigateTo({
diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml
index 18431b5..52e8e20 100644
--- a/pages/indexNew/indexNew.wxml
+++ b/pages/indexNew/indexNew.wxml
@@ -175,11 +175,21 @@
+
+
diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index bb84ec5..f68aea3 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
// }
// })
let that = this
- const versionNum = "1.6.27"
+ const versionNum = "1.6.28"
api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data)
let state = res.data.scanFlag