Merge branch 'release'

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

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
+    // let id = this.data.id
-    api.detail(id).then(res => {
+    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,

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)
     }

subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml

@@ -5,7 +5,7 @@
     <view class="detail-subtitle">
       <view class="left">
         <span>{{noticeObj.deptName}}</span>
-        <span>{{filter.formatTime(noticeObj.newsStartTime, 'yyyy-MM-dd')}}</span>
+        <span>{{filter.formatTime(noticeObj.noticeTime, 'yyyy-MM-dd')}}</span>
       </view>
       <view class="right">
         <view class="readNum">

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')

subpages/understandJs/pages/noticeDetail/noticeDetail.wxml

@@ -30,7 +30,7 @@
     <view class="detail-subtitle">
       <view class="left">
         <span>{{noticeObj.deptName}}</span>
-        <span>{{filter.formatTime(noticeObj.newsStartTime, 'yyyy-MM-dd')}}</span>
+        <span>{{filter.formatTime(noticeObj.noticeTime, 'yyyy-MM-dd')}}</span>
       </view>
       <view class="right">
         <view class="readNum">

utils/api.js

@@ -323,8 +323,11 @@ function leaderboard () {
 /**
  * 活动详情
  */
-function detail (id) {
+function detail ({id,actType}) {
-  return fly.get(`heart/act/detail/${id}`)
+  return fly.get(`heart/act/detail`,{
+    id: id,
+    actType: actType
+  })
 }
 
 /**