From dceed30cf66862dfe85b45984b870519ad4da2f6 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Thu, 13 Aug 2020 09:15:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=89=E5=85=A8360=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=AE=89=E5=85=A8365;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.config.json | 6 +++--- subpages/oneKeyService/pages/noticeDetail/noticeDetail.js | 2 +- subpages/oneKeyService/pages/warning/warning.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/project.config.json b/project.config.json index 100379d..dacd5e0 100644 --- a/project.config.json +++ b/project.config.json @@ -17,15 +17,15 @@ "checkInvalidKey": true, "checkSiteMap": true, "uploadWithSourceMap": true, - "compileHotReLoad": false, "babelSetting": { "ignore": [], "disablePlugins": [], "outputPath": "" }, - "useIsolateContext": true, "useCompilerModule": false, - "userConfirmedUseCompilerModuleSwitch": false + "userConfirmedUseCompilerModuleSwitch": false, + "compileHotReLoad": false, + "useIsolateContext": true }, "compileType": "miniprogram", "libVersion": "2.8.2", 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/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') From 7f616553d4fc57665990123201f5537f4325337c Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Thu, 13 Aug 2020 14:44:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA=E6=97=B6=E9=97=B4bug?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.config.json | 2 +- subpages/oneKeyService/pages/noticeDetail/noticeDetail.wxml | 2 +- subpages/understandJs/pages/noticeDetail/noticeDetail.wxml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.config.json b/project.config.json index dacd5e0..c722415 100644 --- a/project.config.json +++ b/project.config.json @@ -22,7 +22,7 @@ "disablePlugins": [], "outputPath": "" }, - "useCompilerModule": false, + "useCompilerModule": true, "userConfirmedUseCompilerModuleSwitch": false, "compileHotReLoad": false, "useIsolateContext": true 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/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')}} From 6cce15fac074c43399e90498ed4cf2d605c91629 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Thu, 13 Aug 2020 17:50:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0?= =?UTF-8?q?actType=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.config.json | 2 +- subpages/heart/pages/heartDetail/heartDetail.js | 10 ++++++++-- utils/api.js | 7 +++++-- utils/config.js | 4 ++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/project.config.json b/project.config.json index c722415..dacd5e0 100644 --- a/project.config.json +++ b/project.config.json @@ -22,7 +22,7 @@ "disablePlugins": [], "outputPath": "" }, - "useCompilerModule": true, + "useCompilerModule": false, "userConfirmedUseCompilerModuleSwitch": false, "compileHotReLoad": false, "useIsolateContext": true 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/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 + }) } /** diff --git a/utils/config.js b/utils/config.js index 58acdf1..7bd1014 100644 --- a/utils/config.js +++ b/utils/config.js @@ -6,13 +6,13 @@ module.exports = { }; function BASEURL() { - // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 + return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 // return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址 // return "http://192.168.43.19:9094/epdc-api/api/" // 测试环境 ip接口地址 // return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址 // return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址 // return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址 - return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 + // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 // return 'http://10.10.10.63:9094/epdc-api/api/' } From 6679c0e0327ef9f49f84943b6f7ad7a3dbf86d31 Mon Sep 17 00:00:00 2001 From: lihenian <2629534615@qq.com> Date: Fri, 14 Aug 2020 17:57:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=89=88=E6=9C=AC1.4.23=20=E5=BF=97?= =?UTF-8?q?=E6=84=BF=E8=80=85=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0actType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/toRegister/toRegister.js | 2 +- project.config.json | 6 +++--- utils/config.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) 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/project.config.json b/project.config.json index dacd5e0..100379d 100644 --- a/project.config.json +++ b/project.config.json @@ -17,15 +17,15 @@ "checkInvalidKey": true, "checkSiteMap": true, "uploadWithSourceMap": true, + "compileHotReLoad": false, "babelSetting": { "ignore": [], "disablePlugins": [], "outputPath": "" }, + "useIsolateContext": true, "useCompilerModule": false, - "userConfirmedUseCompilerModuleSwitch": false, - "compileHotReLoad": false, - "useIsolateContext": true + "userConfirmedUseCompilerModuleSwitch": false }, "compileType": "miniprogram", "libVersion": "2.8.2", diff --git a/utils/config.js b/utils/config.js index 7bd1014..58acdf1 100644 --- a/utils/config.js +++ b/utils/config.js @@ -6,13 +6,13 @@ module.exports = { }; function BASEURL() { - return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 + // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 // return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址 // return "http://192.168.43.19:9094/epdc-api/api/" // 测试环境 ip接口地址 // return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址 // return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址 // return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址 - // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 + return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 // return 'http://10.10.10.63:9094/epdc-api/api/' }