diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 2ce6db7..2abd9aa 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.4.23" + const versionNum = "1.4.24" 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 100379d..bbc1504 100644 --- a/project.config.json +++ b/project.config.json @@ -24,7 +24,7 @@ "outputPath": "" }, "useIsolateContext": true, - "useCompilerModule": false, + "useCompilerModule": true, "userConfirmedUseCompilerModuleSwitch": false }, "compileType": "miniprogram", @@ -130,6 +130,13 @@ "pathName": "pages/toRegister/toRegister", "query": "", "scene": null + }, + { + "id": -1, + "name": "subpages/heart/pages/leaderboardNew/leaderboardNew", + "pathName": "subpages/heart/pages/leaderboardNew/leaderboardNew", + "query": "", + "scene": null } ] } diff --git a/subpages/discussion/pages/addIssue/addIssue.wxml b/subpages/discussion/pages/addIssue/addIssue.wxml index 3cc1255..b1eae5a 100644 --- a/subpages/discussion/pages/addIssue/addIssue.wxml +++ b/subpages/discussion/pages/addIssue/addIssue.wxml @@ -22,10 +22,17 @@ - + - 希望人大代表倾听 + 人大在倾听 + + + + + + + 政协委员有事好商量 diff --git a/subpages/discussion/pages/addIssue/addIssue.wxss b/subpages/discussion/pages/addIssue/addIssue.wxss index 3b22264..f874734 100644 --- a/subpages/discussion/pages/addIssue/addIssue.wxss +++ b/subpages/discussion/pages/addIssue/addIssue.wxss @@ -13,7 +13,7 @@ page { .add-issue .issue-content { width: 100%; - height: 650rpx; + height: 730rpx; border-radius: 16rpx; background: #fff; box-sizing: border-box; @@ -137,7 +137,7 @@ page { display: flex; justify-content: center; align-items: center; - margin-top: 180rpx; + margin-top: 100rpx; } .add-issue .publish-issue button { @@ -164,7 +164,7 @@ page { } .info-tips { - width: 300rpx; + width: 400rpx; height: auto; /* display: flex; flex-direction: column; diff --git a/subpages/heart/pages/clockIn/clockIn.js b/subpages/heart/pages/clockIn/clockIn.js index 98da64a..4c0728e 100644 --- a/subpages/heart/pages/clockIn/clockIn.js +++ b/subpages/heart/pages/clockIn/clockIn.js @@ -25,7 +25,8 @@ Page({ phraseId: "", //常用语id ldata: false, violationsCount: 0, //违规次数 - isConReview: false + isConReview: false, + submissionDisabled: false }, /** * 生命周期函数--监听页面加载 @@ -236,6 +237,9 @@ Page({ return false } + this.setData({ + submissionDisabled: true + }) if (this.data.phraseId) { api.sagenumAddOne(this.data.phraseId).then(function () { // console.log('常用语言:' + res) @@ -298,6 +302,9 @@ Page({ // console.log('~~~~~~~":::::' + JSON.stringify(params)) let that = this api.clock(params).then(function (res) { + that.setData({ + submissionDisabled: false + }) if (res.code == 0) { wx.showToast({ title: "打卡成功", @@ -337,6 +344,11 @@ Page({ }) } } + }).catch(err => { + console.log(err) + that.setData({ + submissionDisabled: false + }) }) }, Rad (d) { //经纬度转换成三角函数中度分表形式。 diff --git a/subpages/heart/pages/clockIn/clockIn.wxml b/subpages/heart/pages/clockIn/clockIn.wxml index f372817..139f94c 100644 --- a/subpages/heart/pages/clockIn/clockIn.wxml +++ b/subpages/heart/pages/clockIn/clockIn.wxml @@ -41,5 +41,5 @@ - 提交打卡 + 提交打卡 \ No newline at end of file diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml index ccc5361..35f2a98 100644 --- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml +++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml @@ -1,6 +1,10 @@ diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss index 32d8470..67a7db2 100644 --- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss +++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxss @@ -248,4 +248,15 @@ button::after { .banner image{ width: 310rpx; height: 440rpx; + } + + .banner .swiper { + width: 100%; + height: 100%; + } + .banner .swiper .swiper-item { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; } \ No newline at end of file