From 651e8af60c44f95fe098664f040a55bae2f75d42 Mon Sep 17 00:00:00 2001 From: lihenian <2629534615@qq.com> Date: Tue, 18 Aug 2020 13:40:35 +0800 Subject: [PATCH 1/6] commit --- project.config.json | 2 +- subpages/discussion/pages/addIssue/addIssue.wxml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.config.json b/project.config.json index bbc1504..beae865 100644 --- a/project.config.json +++ b/project.config.json @@ -24,7 +24,7 @@ "outputPath": "" }, "useIsolateContext": true, - "useCompilerModule": true, + "useCompilerModule": false, "userConfirmedUseCompilerModuleSwitch": false }, "compileType": "miniprogram", diff --git a/subpages/discussion/pages/addIssue/addIssue.wxml b/subpages/discussion/pages/addIssue/addIssue.wxml index b1eae5a..33b3301 100644 --- a/subpages/discussion/pages/addIssue/addIssue.wxml +++ b/subpages/discussion/pages/addIssue/addIssue.wxml @@ -32,7 +32,7 @@ - 政协委员有事好商量 + 有事好商量 From 39702b747f5e0acf4acef0e41701a272cbac00ce Mon Sep 17 00:00:00 2001 From: lihenian <2629534615@qq.com> Date: Tue, 18 Aug 2020 13:42:53 +0800 Subject: [PATCH 2/6] commit --- subpages/discussion/pages/addIssue/addIssue.wxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subpages/discussion/pages/addIssue/addIssue.wxml b/subpages/discussion/pages/addIssue/addIssue.wxml index 33b3301..2ddea14 100644 --- a/subpages/discussion/pages/addIssue/addIssue.wxml +++ b/subpages/discussion/pages/addIssue/addIssue.wxml @@ -32,7 +32,7 @@ - 有事好商量 + 政协好商量 From efe731f925ba582adbf50d34d712345ba18c0e1d Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 18 Aug 2020 17:17:28 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=B2=BE=E5=BD=A9=E8=AF=B4=E8=AF=B4?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=E6=A0=B7=E5=BC=8F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/activity/activity.wxml | 2 +- project.config.json | 6 +++--- subpages/heart/pages/heartDetail/heartDetail.wxml | 2 +- utils/config.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/activity/activity.wxml b/components/activity/activity.wxml index 0f529da..491a76e 100644 --- a/components/activity/activity.wxml +++ b/components/activity/activity.wxml @@ -25,7 +25,7 @@ 活动地点：{{item.actAddress}} - + 不限名额 活动名额 {{item.actQuota}}人 diff --git a/project.config.json b/project.config.json index beae865..97977e3 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/heart/pages/heartDetail/heartDetail.wxml b/subpages/heart/pages/heartDetail/heartDetail.wxml index 7158c50..0f3bef4 100644 --- a/subpages/heart/pages/heartDetail/heartDetail.wxml +++ b/subpages/heart/pages/heartDetail/heartDetail.wxml @@ -118,7 +118,7 @@ - + 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 61b021f7b7847e914eed72aaf320fe84c19bda6a Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 18 Aug 2020 17:19:16 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=B2=BE=E5=BD=A9=E8=AF=B4=E8=AF=B4?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=E6=A0=B7=E5=BC=8F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpages/discussion/pages/addIssue/addIssue.wxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subpages/discussion/pages/addIssue/addIssue.wxml b/subpages/discussion/pages/addIssue/addIssue.wxml index 2ddea14..d0c2ca8 100644 --- a/subpages/discussion/pages/addIssue/addIssue.wxml +++ b/subpages/discussion/pages/addIssue/addIssue.wxml @@ -29,7 +29,7 @@ - + 政协好商量 From 5f77a3de8685061a23d87e7003a24ef1037572cf Mon Sep 17 00:00:00 2001 From: lihenian <2629534615@qq.com> Date: Tue, 18 Aug 2020 17:56:37 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=89=88=E6=9C=AC1.4.26=20=E7=B2=BE?= =?UTF-8?q?=E5=BD=A9=E8=AF=B4=E8=AF=B4=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=9B?= 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 2abd9aa..2d34e87 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.4.24" + const versionNum = "1.4.26" 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 97977e3..beae865 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/' } From 0ca4883b9a202a0a0e58c31522ce9072d2723275 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 18 Aug 2020 18:08:45 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=81=AB=E7=81=ABbanner?= =?UTF-8?q?=E9=A2=84=E8=A7=88BUG=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/leaderboardNew/leaderboardNew.js | 4 ++-- subpages/heart/pages/leaderboardNew/leaderboardNew.wxml | 4 ++-- utils/config.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/project.config.json b/project.config.json index 97977e3..9664eaf 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/heart/pages/leaderboardNew/leaderboardNew.js b/subpages/heart/pages/leaderboardNew/leaderboardNew.js index 3afe0b1..3053a54 100644 --- a/subpages/heart/pages/leaderboardNew/leaderboardNew.js +++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.js @@ -87,8 +87,8 @@ Page({ }, preViewImage (e) { let list = []; - list.push(this.data.banner[0].bannerImg) - list.push(this.data.banner[1].bannerImg) + list.push(this.data.banner[e.currentTarget.dataset.listIndex].bannerImg) + list.push(this.data.banner[e.currentTarget.dataset.listIndex+1].bannerImg) wx.previewImage({ urls: list, current: e.currentTarget.dataset.src diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml index 35f2a98..8d5cda4 100644 --- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml +++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml @@ -1,8 +1,8 @@ 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/' }