diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 0b7fcb6..2ce6db7 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.4.22" + const versionNum = "1.4.23" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/subpages/heart/pages/heartDetail/heartDetail.js b/subpages/heart/pages/heartDetail/heartDetail.js index 4228b60..cf21efd 100644 --- a/subpages/heart/pages/heartDetail/heartDetail.js +++ b/subpages/heart/pages/heartDetail/heartDetail.js @@ -26,6 +26,7 @@ Page({ preloadVisible: true, timeJudge: false,//根据当前时间比较活动结束时间,判断活动是否已经结束,用以判断显示订单多多里面的志愿者 defaultGridId:"",//默认网格 + actType: "" }, onLoad: function (options) { console.log("当前时间" + getTimestamp()) @@ -34,6 +35,7 @@ Page({ actCurrentState: options.actcurrentstate, signupFlag: options.signupflag, selectedTab: options.selectedTab, + actType: options.selectedTab==undefined?'':options.selectedTab=='tab0'?'0':options.selectedTab=='tab2'?'1':'' }) // this.getDetail();//活动详情 // this.clockList();//打卡列表 @@ -45,8 +47,12 @@ Page({ }, // 获取详情信息 getDetail () { - let id = this.data.id - api.detail(id).then(res => { + // let id = this.data.id + const param = { + id: this.data.id, + actType: this.data.actType + } + api.detail(param).then(res => { if (res.code === 0 && res.msg === "success") { this.setData({ detail: res.data, diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js index 7cb8e38..831a447 100644 --- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js +++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js @@ -33,7 +33,7 @@ Page({ this.noticeDetail(options.id) } else if(options.modulecode == 'notice_aq'){ wx.setNavigationBarTitle({ - title: '安全360' + title: '安全365' }) this.noticeDetail(options.id) } diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml index 9c43ce3..632d7db 100644 --- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml +++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml @@ -5,7 +5,7 @@ {{noticeObj.deptName}} - {{filter.formatTime(noticeObj.newsStartTime, 'yyyy-MM-dd')}} + {{filter.formatTime(noticeObj.noticeTime, 'yyyy-MM-dd')}} diff --git a/subpages/oneKeyService/pages/warning/warning.js b/subpages/oneKeyService/pages/warning/warning.js index d8bffad..0dfbf4a 100644 --- a/subpages/oneKeyService/pages/warning/warning.js +++ b/subpages/oneKeyService/pages/warning/warning.js @@ -42,7 +42,7 @@ Page({ }else if(options.modulecode == 'notice_aq'){ this.getBannerList('5') wx.setNavigationBarTitle({ - title: '安全360' + title: '安全365' }) }else{ this.getBannerList('2') diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml b/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml index 6f108dd..8afa456 100644 --- a/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml +++ b/subpages/understandJs/pages/noticeDetail/noticeDetail.wxml @@ -30,7 +30,7 @@ {{noticeObj.deptName}} - {{filter.formatTime(noticeObj.newsStartTime, 'yyyy-MM-dd')}} + {{filter.formatTime(noticeObj.noticeTime, 'yyyy-MM-dd')}} diff --git a/utils/api.js b/utils/api.js index a7e143c..620c78e 100644 --- a/utils/api.js +++ b/utils/api.js @@ -323,8 +323,11 @@ function leaderboard () { /** * 活动详情 */ -function detail (id) { - return fly.get(`heart/act/detail/${id}`) +function detail ({id,actType}) { + return fly.get(`heart/act/detail`,{ + id: id, + actType: actType + }) } /**