diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js
index ca76ed6..9a6ebdc 100644
--- a/pages/heartNew/heartNew.js
+++ b/pages/heartNew/heartNew.js
@@ -661,11 +661,11 @@ Page({
//如果是 详情样式,直接跳转详情页面
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}`
+ 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}&detailstyle=${this.data.shouye.detailStyle}`
})
} 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}`
+ 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}&detailstyle=${this.data.shouye.detailStyle}`
})
}
},
diff --git a/pages/heartNew/heartNew.wxss b/pages/heartNew/heartNew.wxss
index fdaeb6a..776f1fc 100644
--- a/pages/heartNew/heartNew.wxss
+++ b/pages/heartNew/heartNew.wxss
@@ -361,7 +361,8 @@ button:last-child {
.tab-bar .tab {
font-size: 34rpx;
font-weight: 500;
- color: rgba(171, 171, 171, 1);
+ /* color: rgba(171, 171, 171, 1); */
+ color: rgba(0, 0, 0, 1);
width: 25%;
height: 100%;
line-height: 92rpx;
diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 7fc97c9..78372a7 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
// }
// })
let that = this
- const versionNum = "1.6.38"
+ const versionNum = "1.6.40"
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 67c0b4a..0cbc30a 100644
--- a/subpages/oneKeyService/pages/moduleList/moduleList.js
+++ b/subpages/oneKeyService/pages/moduleList/moduleList.js
@@ -95,7 +95,7 @@ Page({
//modulestyle 调用模式
getModuleStyleType () {
let moduleStyle = this.data.moduleInfo.modulestyle
- if (moduleStyle == '1' || moduleStyle == '3' || moduleStyle == '5' || moduleStyle == '6' || moduleStyle == '7' || moduleStyle == '9') {
+ if (moduleStyle == '1' || moduleStyle == '3' || moduleStyle == '5' || moduleStyle == '6' || moduleStyle == '7' || moduleStyle == '9' || moduleStyle == '10') {
return 'notice_list'
} else if (moduleStyle == '2') {
return 'module_list'
@@ -299,12 +299,12 @@ Page({
const info = e.currentTarget.dataset.info
if (info.moduleStyle == '4') {
wx.navigateTo({
- url: `../noticeDetail/noticeDetail?pid=${info.pid}&bannerflag=${info.bannerFlag}&categorycode=${info.categoryCode}&modulestyle=${info.moduleStyle}&categoryname=${info.categoryName}&commentFlag=${info.commentFlag}`
+ url: `../noticeDetail/noticeDetail?pid=${info.pid}&bannerflag=${info.bannerFlag}&categorycode=${info.categoryCode}&modulestyle=${info.moduleStyle}&categoryname=${info.categoryName}&commentFlag=${info.commentFlag}&detailstyle=${info.detailStyle}`
})
}
else {
wx.navigateTo({
- url: `./moduleList?pid=${info.id}&bannerflag=${info.bannerFlag}&categorycode=${info.categoryCode}&modulestyle=${info.moduleStyle}&categoryname=${info.categoryName}&commentFlag=${info.commentFlag}`
+ url: `./moduleList?pid=${info.id}&bannerflag=${info.bannerFlag}&categorycode=${info.categoryCode}&modulestyle=${info.moduleStyle}&categoryname=${info.categoryName}&commentFlag=${info.commentFlag}&detailstyle=${info.detailStyle}`
})
}
},
@@ -313,7 +313,7 @@ Page({
toDetail(e){
const info = e.currentTarget.dataset
wx.navigateTo({
- url: `../noticeDetail/noticeDetail?id=${info.id}&title=${this.data.moduleInfo.categoryname}&commentFlag=${this.data.moduleInfo.commentFlag}`
+ url: `../noticeDetail/noticeDetail?id=${info.id}&title=${this.data.moduleInfo.categoryname}&commentFlag=${this.data.moduleInfo.commentFlag}&detailstyle=${this.data.moduleInfo.detailstyle}`
})
},
diff --git a/subpages/oneKeyService/pages/moduleList/moduleList.wxml b/subpages/oneKeyService/pages/moduleList/moduleList.wxml
index 18afde4..d5cc681 100644
--- a/subpages/oneKeyService/pages/moduleList/moduleList.wxml
+++ b/subpages/oneKeyService/pages/moduleList/moduleList.wxml
@@ -118,6 +118,21 @@
{{item.noticeTitle}}
+
+
+
+
+
+
+
+ {{item.noticeTitle}}
+
+
+ {{filter.formatTime(item.noticeTime, 'yyyy-MM-dd')}}
+
+
+
+
diff --git a/subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.wxml b/subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.wxml
index 114f2a5..12b3d11 100644
--- a/subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.wxml
+++ b/subpages/oneKeyService/pages/noticeDetail/components/detailRemark/detailRemark.wxml
@@ -23,7 +23,7 @@
- {{noticeObj.noticeTitle}}
+ {{noticeObj.noticeTitle}}
- {{noticeObj.deptName}}
- {{filter.formatTime(noticeObj.noticeTime, 'yyyy-MM-dd')}}
+ {{noticeObj.deptName}}
+ {{filter.formatTime(noticeObj.noticeTime, 'yyyy-MM-dd')}}
-
+
{{noticeObj.readingAmount}}
-
+