From 25c63b4f780d6936e1815873bfd218439b27bb6d Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Mon, 31 Aug 2020 09:31:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BF=97=E5=8F=8B?= =?UTF-8?q?=E6=9C=B5=E6=9C=B5=E6=90=9C=E7=B4=A2=E7=BF=BB=E9=A1=B5BUG?= =?UTF-8?q?=EF=BC=9B=E7=A7=AF=E5=88=86=E7=81=AB=E7=81=AB=E4=B8=AD=E7=88=B1?= =?UTF-8?q?=E5=BF=83=E6=97=B6=E9=95=BF=E5=8D=95=E4=BD=8D=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=B0=8F=E6=97=B6=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/heartNew/heartNew.js | 10 +- project.config.json | 284 +++++++++--------- .../pages/leaderboardNew/leaderboardNew.wxml | 2 +- 3 files changed, 150 insertions(+), 146 deletions(-) diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js index eaa15a0..0a0cf07 100644 --- a/pages/heartNew/heartNew.js +++ b/pages/heartNew/heartNew.js @@ -92,6 +92,7 @@ Page({ let parms = { pageIndex: this.data.indexPage, pageSize: this.data.pageSize, + nickname: this.data.searchName } this.volunteerlist(parms) } @@ -137,6 +138,7 @@ Page({ let parms = { pageIndex: this.data.indexPage, pageSize: this.data.pageSize, + nickname: this.data.searchName } this.volunteerlist(parms) } else if (e.currentTarget.dataset.tab == "tab2") { @@ -260,14 +262,15 @@ Page({ }) return; } + this.setData({ + volunteerlist: [], + indexPage: 1 + }) let parms = { pageIndex: this.data.indexPage, pageSize: this.data.pageSize, nickname: this.data.searchName } - this.setData({ - volunteerlist: [] - }) this.volunteerlist(parms) }, /** @@ -345,6 +348,7 @@ Page({ let parms = { pageIndex: this.data.indexPage, pageSize: this.data.pageSize, + nickname: this.data.searchName } this.volunteerlist(parms) } else if (this.data.selectedTab == "tab2") { diff --git a/project.config.json b/project.config.json index beae865..3a679df 100644 --- a/project.config.json +++ b/project.config.json @@ -1,144 +1,144 @@ { - "description": "项目配置文件", - "packOptions": { - "ignore": [] - }, - "setting": { - "urlCheck": false, - "es6": true, - "postcss": true, - "preloadBackgroundData": false, - "minified": true, - "newFeature": true, - "coverView": true, - "autoAudits": false, - "showShadowRootInWxmlPanel": true, - "scopeDataCheck": false, - "checkInvalidKey": true, - "checkSiteMap": true, - "uploadWithSourceMap": true, - "compileHotReLoad": false, - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" - }, - "useIsolateContext": true, - "useCompilerModule": false, - "userConfirmedUseCompilerModuleSwitch": false - }, - "compileType": "miniprogram", - "libVersion": "2.8.2", - "appid": "wx6dcf544cdae7d4ec", - "projectname": "%E7%B2%BE%E8%87%B4%E9%94%A6%E6%B0%B4-%E5%B1%85%E6%B0%9 1%E7%AB%AF", - "debugOptions": { - "hidedInDevtools": [] - }, - "isGameTourist": false, - "simulatorType": "wechat", - "simulatorPluginLibVersion": {}, - "condition": { - "search": { - "current": -1, - "list": [] - }, - "conversation": { - "current": -1, - "list": [] - }, - "plugin": { - "current": -1, - "list": [] - }, - "game": { - "currentL": -1, - "list": [] - }, - "gamePlugin": { - "current": -1, - "list": [] - }, - "miniprogram": { - "current": -1, - "list": [ - { - "id": 0, - "name": "pages/formid/formid", - "pathName": "pages/formid/formid", - "query": "gid=1233592630168813569", - "scene": 1011 - }, - { - "id": 1, - "name": "pages/indexNew/indexNew", - "pathName": "pages/indexNew/indexNew", - "query": "scene=1233592247862198274", - "scene": 1011 - }, - { - "id": 2, - "name": "网格长注册", - "pathName": "pages/index/index", - "query": "scene=gridLeader", - "scene": 1011 - }, - { - "id": 3, - "name": "subpages/home/pages/newsDetail/newsDetail", - "pathName": "subpages/home/pages/newsDetail/newsDetail", - "query": "id=7c8bc749ff4b6380bf1d902c0bde0ba&defaultGridId=1233592630168813569", - "scene": null - }, - { - "id": -1, - "name": "社群列表", - "pathName": "subpages/associationNew/pages/associationlist/associationlist", - "query": "", - "scene": null - }, - { - "id": 5, - "name": "数据端跳转", - "pathName": "pages/indexNew/indexNew", - "query": "scene=1277169327606366209&from=analysis", - "scene": null - }, - { - "id": 6, - "name": "工作端跳转", - "pathName": "pages/indexNew/indexNew", - "query": "scene=1280737901335838721&from=work", - "scene": null - }, - { - "id": -1, - "name": "锦水档案", - "pathName": "subpages/understandJs/pages/archives/archives", - "query": "", - "scene": null - }, - { - "id": 8, - "name": "搜索页面", - "pathName": "subpages/oneKeyService/pages/search/search", - "query": "", - "scene": null - }, - { - "id": -1, - "name": "注册页面", - "pathName": "pages/toRegister/toRegister", - "query": "", - "scene": null - }, - { - "id": -1, - "name": "subpages/heart/pages/leaderboardNew/leaderboardNew", - "pathName": "subpages/heart/pages/leaderboardNew/leaderboardNew", - "query": "", - "scene": null - } - ] - } - } + "description": "项目配置文件", + "packOptions": { + "ignore": [] + }, + "setting": { + "urlCheck": false, + "es6": true, + "postcss": true, + "preloadBackgroundData": false, + "minified": true, + "newFeature": true, + "coverView": true, + "autoAudits": false, + "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, + "checkInvalidKey": true, + "checkSiteMap": true, + "uploadWithSourceMap": true, + "compileHotReLoad": false, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + }, + "useIsolateContext": true, + "useCompilerModule": false, + "userConfirmedUseCompilerModuleSwitch": false + }, + "compileType": "miniprogram", + "libVersion": "2.8.2", + "appid": "wx6dcf544cdae7d4ec", + "projectname": "%E7%B2%BE%E8%87%B4%E9%94%A6%E6%B0%B4-%E5%B1%85%E6%B0%9 1%E7%AB%AF", + "debugOptions": { + "hidedInDevtools": [] + }, + "isGameTourist": false, + "simulatorType": "wechat", + "simulatorPluginLibVersion": {}, + "condition": { + "search": { + "current": -1, + "list": [] + }, + "conversation": { + "current": -1, + "list": [] + }, + "plugin": { + "current": -1, + "list": [] + }, + "game": { + "currentL": -1, + "list": [] + }, + "gamePlugin": { + "current": -1, + "list": [] + }, + "miniprogram": { + "current": -1, + "list": [ + { + "id": 0, + "name": "pages/formid/formid", + "pathName": "pages/formid/formid", + "query": "gid=1233592630168813569", + "scene": 1011 + }, + { + "id": 1, + "name": "pages/indexNew/indexNew", + "pathName": "pages/indexNew/indexNew", + "query": "scene=1233592247862198274", + "scene": 1011 + }, + { + "id": 2, + "name": "网格长注册", + "pathName": "pages/index/index", + "query": "scene=gridLeader", + "scene": 1011 + }, + { + "id": 3, + "name": "subpages/home/pages/newsDetail/newsDetail", + "pathName": "subpages/home/pages/newsDetail/newsDetail", + "query": "id=7c8bc749ff4b6380bf1d902c0bde0ba&defaultGridId=1233592630168813569", + "scene": null + }, + { + "id": -1, + "name": "社群列表", + "pathName": "subpages/associationNew/pages/associationlist/associationlist", + "query": "", + "scene": null + }, + { + "id": 5, + "name": "数据端跳转", + "pathName": "pages/indexNew/indexNew", + "query": "scene=1277169327606366209&from=analysis", + "scene": null + }, + { + "id": 6, + "name": "工作端跳转", + "pathName": "pages/indexNew/indexNew", + "query": "scene=1280737901335838721&from=work", + "scene": null + }, + { + "id": -1, + "name": "锦水档案", + "pathName": "subpages/understandJs/pages/archives/archives", + "query": "", + "scene": null + }, + { + "id": 8, + "name": "搜索页面", + "pathName": "subpages/oneKeyService/pages/search/search", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "注册页面", + "pathName": "pages/toRegister/toRegister", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "subpages/heart/pages/leaderboardNew/leaderboardNew", + "pathName": "subpages/heart/pages/leaderboardNew/leaderboardNew", + "query": "", + "scene": null + } + ] + } + } } \ No newline at end of file diff --git a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml index f80a9f6..e3d1969 100644 --- a/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml +++ b/subpages/heart/pages/leaderboardNew/leaderboardNew.wxml @@ -30,7 +30,7 @@ {{item.nickname}} - 爱心时长 {{item.kindnessTime}}分钟 + 爱心时长 {{item.kindnessTime}}小时 参加次数 {{item.participationNum}}次 From 4bd7dac6f5687b2e495cde4aa8b471e26cd90982 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Mon, 31 Aug 2020 14:28:13 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=89=88=E6=9C=AC1.4.31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/toRegister/toRegister.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 0753331..ece4cfc 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.4.30" + const versionNum = "1.4.31" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag From 657606093d2a79f9982479febd97efaa611aaba9 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Wed, 2 Sep 2020 21:02:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=B8=80=E9=94=AE=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9F=8E=E7=AE=A1=E8=81=9A=E7=84=A6=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 +++--- subpages/oneKeyService/pages/index/index.js | 4 ++++ subpages/oneKeyService/pages/noticeDetail/noticeDetail.js | 5 +++++ subpages/oneKeyService/pages/noticeDetail/noticeDetail.json | 2 +- subpages/oneKeyService/pages/warning/warning.js | 5 +++++ subpages/oneKeyService/pages/warning/warning.json | 2 +- 7 files changed, 20 insertions(+), 6 deletions(-) diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index ece4cfc..3e20967 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.4.31" + const versionNum = "1.4.32" 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 3a679df..0e8739b 100644 --- a/project.config.json +++ b/project.config.json @@ -111,9 +111,9 @@ "scene": null }, { - "id": -1, - "name": "锦水档案", - "pathName": "subpages/understandJs/pages/archives/archives", + "id": 7, + "name": "我有事说", + "pathName": "subpages/discussion/pages/addIssue/addIssue", "query": "", "scene": null }, diff --git a/subpages/oneKeyService/pages/index/index.js b/subpages/oneKeyService/pages/index/index.js index eb0899f..be2b1eb 100644 --- a/subpages/oneKeyService/pages/index/index.js +++ b/subpages/oneKeyService/pages/index/index.js @@ -67,6 +67,10 @@ Page({ wx.navigateTo({ url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}` }) + } else if (e.currentTarget.dataset.modulecode == 'notice_cgjj') { + wx.navigateTo({ + url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}` + }) } } }) \ No newline at end of file diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js index 831a447..8746f45 100644 --- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js +++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js @@ -36,6 +36,11 @@ Page({ title: '安全365' }) this.noticeDetail(options.id) + } else if(options.modulecode == 'notice_cgjj'){ + wx.setNavigationBarTitle({ + title: '城管聚焦' + }) + this.noticeDetail(options.id) } }, diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.json b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.json index b86ff26..d8bbc60 100644 --- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.json +++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.json @@ -1,4 +1,4 @@ { "usingComponents": {}, - "navigationBarTitleText": "锦水" + "navigationBarTitleText": "" } \ No newline at end of file diff --git a/subpages/oneKeyService/pages/warning/warning.js b/subpages/oneKeyService/pages/warning/warning.js index 0dfbf4a..b5890d0 100644 --- a/subpages/oneKeyService/pages/warning/warning.js +++ b/subpages/oneKeyService/pages/warning/warning.js @@ -44,6 +44,11 @@ Page({ wx.setNavigationBarTitle({ title: '安全365' }) + }else if(options.modulecode == 'notice_cgjj'){ + this.getBannerList('6') + wx.setNavigationBarTitle({ + title: '城管聚焦' + }) }else{ this.getBannerList('2') wx.setNavigationBarTitle({ diff --git a/subpages/oneKeyService/pages/warning/warning.json b/subpages/oneKeyService/pages/warning/warning.json index 25bf808..8db8a6b 100644 --- a/subpages/oneKeyService/pages/warning/warning.json +++ b/subpages/oneKeyService/pages/warning/warning.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "锦水警事", + "navigationBarTitleText": "", "usingComponents": { "load-more": "../../../../components/loadMore/loadMore", "no-data":"../../../../components/nodata/nodata" From 8d3fa37ab3f5b8272c5a8760e22803e2ea3a4aad Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Thu, 3 Sep 2020 17:34:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=EF=BC=9B=E8=AE=AE=E9=A2=98=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/issueItem/issueItem.wxml | 3 +- .../components/issueItem/issueItem.wxss | 4 ++ .../components/projectItem/projectItem.wxml | 3 +- .../components/projectItem/projectItem.wxss | 4 ++ .../mine/components/issueItem/issueItem.wxml | 3 +- .../mine/components/issueItem/issueItem.wxss | 4 ++ .../components/projectItem/projectItem.wxml | 3 +- .../components/projectItem/projectItem.wxss | 4 ++ .../components/issueItem/issueItem.wxml | 3 +- .../components/issueItem/issueItem.wxss | 4 ++ .../components/projectItem/projectItem.wxml | 3 +- .../components/projectItem/projectItem.wxss | 4 ++ .../discussion/pages/addIssue/addIssue.js | 45 +++++++++++++++++-- .../discussion/pages/addIssue/addIssue.wxml | 21 +++------ .../discussion/pages/addIssue/addIssue.wxss | 4 +- .../detailContent/detailContent.wxml | 3 ++ .../detailContent/detailContent.wxss | 8 +++- .../discussionDetail/discussionDetail.js | 1 + subpages/discussion/utils/api.js | 13 +++++- .../mine/pages/eventDetail/eventDetail.js | 3 +- .../mine/pages/eventDetail/eventDetail.wxml | 2 + .../mine/pages/eventDetail/eventDetail.wxss | 7 ++- utils/config.js | 6 +-- utils/filter.wxs | 6 +++ 24 files changed, 127 insertions(+), 34 deletions(-) diff --git a/pages/discussion/components/issueItem/issueItem.wxml b/pages/discussion/components/issueItem/issueItem.wxml index 76c4bc2..2da682a 100644 --- a/pages/discussion/components/issueItem/issueItem.wxml +++ b/pages/discussion/components/issueItem/issueItem.wxml @@ -1,3 +1,4 @@ + @@ -27,7 +28,7 @@ src="{{item}}" /> - {{issueObj.categoryName}} + {{issueObj.categoryName}}{{filter.getTags(issueObj.tagNames)}} diff --git a/pages/discussion/components/issueItem/issueItem.wxss b/pages/discussion/components/issueItem/issueItem.wxss index 3cd15df..1b38b2c 100644 --- a/pages/discussion/components/issueItem/issueItem.wxss +++ b/pages/discussion/components/issueItem/issueItem.wxss @@ -83,6 +83,10 @@ white-space: nowrap; text-overflow: ellipsis; overflow: hidden; + display: flex; +} +.issue-item .issue-type .category-name { + margin-right: 20rpx; } .issue-item .hot-remark { diff --git a/pages/discussion/components/projectItem/projectItem.wxml b/pages/discussion/components/projectItem/projectItem.wxml index 2e93211..b379b0e 100644 --- a/pages/discussion/components/projectItem/projectItem.wxml +++ b/pages/discussion/components/projectItem/projectItem.wxml @@ -1,3 +1,4 @@ + @@ -27,7 +28,7 @@ src="{{item}}" /> - {{projectObj.categoryName}} + {{projectObj.categoryName}}{{filter.getTags(projectObj.tagNames)}} diff --git a/pages/discussion/components/projectItem/projectItem.wxss b/pages/discussion/components/projectItem/projectItem.wxss index a11a348..5423f81 100644 --- a/pages/discussion/components/projectItem/projectItem.wxss +++ b/pages/discussion/components/projectItem/projectItem.wxss @@ -83,6 +83,10 @@ white-space: nowrap; text-overflow: ellipsis; overflow: hidden; + display: flex; +} +.project-item .issue-type .category-name { + margin-right: 20rpx; } .project-item .hot-remark { diff --git a/pages/mine/components/issueItem/issueItem.wxml b/pages/mine/components/issueItem/issueItem.wxml index daceb6c..7c9fba7 100644 --- a/pages/mine/components/issueItem/issueItem.wxml +++ b/pages/mine/components/issueItem/issueItem.wxml @@ -1,3 +1,4 @@ + {{issueObj.content}} {{issueObj.distributeTime}} @@ -13,7 +14,7 @@ src="{{item}}" /> - {{issueObj.categoryName}} + {{issueObj.categoryName}}{{filter.getTags(issueObj.tagNames)}} 未通过 待审核 讨论中 diff --git a/pages/mine/components/issueItem/issueItem.wxss b/pages/mine/components/issueItem/issueItem.wxss index e005b2e..8dca232 100644 --- a/pages/mine/components/issueItem/issueItem.wxss +++ b/pages/mine/components/issueItem/issueItem.wxss @@ -52,6 +52,10 @@ line-height: 40rpx; color: #FFB400; width: calc(100% - 100rpx); + display: flex; +} +.issue-item .type .issue-catalogy .category-name { + margin-right: 20rpx; } .issue-item .type .handle-type { height: 34rpx; diff --git a/pages/mine/components/projectItem/projectItem.wxml b/pages/mine/components/projectItem/projectItem.wxml index 6f6a9ed..cdf13cd 100644 --- a/pages/mine/components/projectItem/projectItem.wxml +++ b/pages/mine/components/projectItem/projectItem.wxml @@ -1,3 +1,4 @@ + {{projectObj.itemContent}} {{projectObj.createdTime}} @@ -13,7 +14,7 @@ src="{{item}}" /> - {{projectObj.categoryName}} + {{projectObj.categoryName}}{{filter.getTags(projectObj.tagNames)}} 处理中 已关闭 处理完毕 diff --git a/pages/mine/components/projectItem/projectItem.wxss b/pages/mine/components/projectItem/projectItem.wxss index ea3101d..5fb41b2 100644 --- a/pages/mine/components/projectItem/projectItem.wxss +++ b/pages/mine/components/projectItem/projectItem.wxss @@ -50,6 +50,10 @@ line-height: 40rpx; color: #FFB400; width: calc(100% - 100rpx); + display: flex; +} +.project-item .type .issue-catalogy .category-name { + margin-right: 20rpx; } .project-item .type .handle-type { height: 34rpx; diff --git a/subpages/discussion/components/issueItem/issueItem.wxml b/subpages/discussion/components/issueItem/issueItem.wxml index bfebb76..0d083db 100644 --- a/subpages/discussion/components/issueItem/issueItem.wxml +++ b/subpages/discussion/components/issueItem/issueItem.wxml @@ -1,3 +1,4 @@ + @@ -24,7 +25,7 @@ src="{{item}}" /> - {{issueObj.categoryName}} + {{issueObj.categoryName}}{{filter.getTags(issueObj.tagNames)}} diff --git a/subpages/discussion/components/issueItem/issueItem.wxss b/subpages/discussion/components/issueItem/issueItem.wxss index 13e51db..b502347 100644 --- a/subpages/discussion/components/issueItem/issueItem.wxss +++ b/subpages/discussion/components/issueItem/issueItem.wxss @@ -83,6 +83,10 @@ white-space: nowrap; text-overflow: ellipsis; overflow: hidden; + display: flex; +} +.issue-item .issue-type .category-name { + margin-right: 20rpx; } .issue-item .hot-remark { diff --git a/subpages/discussion/components/projectItem/projectItem.wxml b/subpages/discussion/components/projectItem/projectItem.wxml index 219f1e2..77eb230 100644 --- a/subpages/discussion/components/projectItem/projectItem.wxml +++ b/subpages/discussion/components/projectItem/projectItem.wxml @@ -1,3 +1,4 @@ + @@ -24,7 +25,7 @@ src="{{item}}" /> - {{projectObj.categoryName}} + {{projectObj.categoryName}}{{filter.getTags(projectObj.tagNames)}} diff --git a/subpages/discussion/components/projectItem/projectItem.wxss b/subpages/discussion/components/projectItem/projectItem.wxss index ed8e041..7f20f6d 100644 --- a/subpages/discussion/components/projectItem/projectItem.wxss +++ b/subpages/discussion/components/projectItem/projectItem.wxss @@ -83,6 +83,10 @@ white-space: nowrap; text-overflow: ellipsis; overflow: hidden; + display: flex; +} +.project-item .issue-type .category-name { + margin-right: 20rpx; } .project-item .hot-remark { diff --git a/subpages/discussion/pages/addIssue/addIssue.js b/subpages/discussion/pages/addIssue/addIssue.js index 9af33ec..4862a43 100644 --- a/subpages/discussion/pages/addIssue/addIssue.js +++ b/subpages/discussion/pages/addIssue/addIssue.js @@ -1,7 +1,7 @@ const QQMapWX = require("../../utils/qqmap-wx-jssdk") import { $wuxActionSheet } from "../../../../dist/index" const config = require("../../../../utils/config") -import { addIssue } from "../../utils/api" +import { addIssue, getEventTagList } from "../../utils/api" Page({ data: { @@ -17,9 +17,12 @@ Page({ focus: false, isBlock: true, violationsCount: 0, - isConReview: false + isConReview: false, + tagIds: [], + checkboxs: [] }, onLoad () { + this.getEventTagList() this.data.qqMapWX = new QQMapWX({ key: "CMJBZ-4DECI-JXGGN-5B4WU-QLV2H-B5BEJ" }) @@ -42,6 +45,22 @@ Page({ addressContent: e.detail.value }) }, + //获取事件标签列表 + getEventTagList () { + getEventTagList().then(res => { + console.log(res.data) + for (let i=0; i { @@ -231,7 +250,8 @@ Page({ issueLongitude: this.data.longitude, issueLatitude: this.data.latitude, images: imagesList, - isConReview: this.data.isConReview + isConReview: this.data.isConReview, + tagIds: this.data.tagIds } wx.showLoading({ title: "加载中..." @@ -298,6 +318,25 @@ Page({ focus: true }) }, + + checkboxClick (e) { + if (this.data.checkboxs[e.currentTarget.dataset.index].checked) { + this.data.checkboxs[e.currentTarget.dataset.index].checked = false + this.data.tagIds = [] //当前版本标签单选 + } else { + for(let i=0;i + wx:key="imageId"> @@ -21,20 +21,13 @@ - - + + - - - - - - 政协在监督 - - + + {{item.name}} + + diff --git a/subpages/discussion/pages/addIssue/addIssue.wxss b/subpages/discussion/pages/addIssue/addIssue.wxss index f874734..298937f 100644 --- a/subpages/discussion/pages/addIssue/addIssue.wxss +++ b/subpages/discussion/pages/addIssue/addIssue.wxss @@ -5,7 +5,7 @@ page { .add-issue { width: 100%; - height: 100%; + /* height: 100%; */ background: #f7f7f7; box-sizing: border-box; padding: 20rpx 20rpx 0; @@ -13,7 +13,7 @@ page { .add-issue .issue-content { width: 100%; - height: 730rpx; + /* height: 730rpx; */ border-radius: 16rpx; background: #fff; box-sizing: border-box; diff --git a/subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxml b/subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxml index dc13ea3..9583a45 100644 --- a/subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxml +++ b/subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxml @@ -1,3 +1,4 @@ + + {{filter.getTags(detailObj.tagNames)}} + \ No newline at end of file diff --git a/subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxss b/subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxss index 51c571c..a5d89fd 100644 --- a/subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxss +++ b/subpages/discussion/pages/discussionDetail/components/detailContent/detailContent.wxss @@ -8,7 +8,11 @@ margin-bottom: 25rpx; overflow: hidden; } - +.detail-content .tags { + color: #FFB400; + font-size: 28rpx; + margin: 30rpx 0rpx; +} .detail-content .user-info { width: 100%; height: 64rpx; @@ -95,7 +99,7 @@ justify-content: center; padding: 0 15rpx; box-sizing: border-box; - margin-bottom: 105rpx; + margin-bottom: 60rpx; } .detail-content .altitude .normal { width: calc(50% - 17rpx); diff --git a/subpages/discussion/pages/discussionDetail/discussionDetail.js b/subpages/discussion/pages/discussionDetail/discussionDetail.js index 029be35..2eb56ac 100644 --- a/subpages/discussion/pages/discussionDetail/discussionDetail.js +++ b/subpages/discussion/pages/discussionDetail/discussionDetail.js @@ -50,6 +50,7 @@ Page({ itemState: "", // 项目状态 0-处理中 5-已关闭 10-已结案 showSatisfactionEvaluation: false, issueToProjectId: "", // 项目当中，之前的议题id + tagNames: [] }, typeStatisticsObj: { // 列表统计对象 attitudeNum: "", diff --git a/subpages/discussion/utils/api.js b/subpages/discussion/utils/api.js index 06b764d..6f086e9 100644 --- a/subpages/discussion/utils/api.js +++ b/subpages/discussion/utils/api.js @@ -3,14 +3,15 @@ const request = require("../../../utils/request") /** * 发布议题 */ -export function addIssue ({ eventContent, issueAddress, issueLongitude, issueLatitude, images, isConReview }) { +export function addIssue ({ eventContent, issueAddress, issueLongitude, issueLatitude, images, isConReview, tagIds }) { return request.post("events/issue/submit", { eventContent, issueAddress, issueLongitude, issueLatitude, images, - isConReview + isConReview, + tagIds }) } @@ -312,4 +313,12 @@ export function getIssueHandleProgressV2 (issueId) { */ export function getProjectHandleProgressV2 (itemId) { return request.get(`events/item/v2/progress/${itemId}`) +} + + +/** + * 获取事件标签 + */ +export function getEventTagList (itemId) { + return request.get(`events/issue/eventtag/list`) } \ No newline at end of file diff --git a/subpages/mine/pages/eventDetail/eventDetail.js b/subpages/mine/pages/eventDetail/eventDetail.js index 8296e87..a59a848 100644 --- a/subpages/mine/pages/eventDetail/eventDetail.js +++ b/subpages/mine/pages/eventDetail/eventDetail.js @@ -12,7 +12,8 @@ Page({ distributeTime: "", content: "", images: "", - advice: "" + advice: "", + tagNames: [] } }, onLoad (options) { diff --git a/subpages/mine/pages/eventDetail/eventDetail.wxml b/subpages/mine/pages/eventDetail/eventDetail.wxml index 1300dad..5fd1e61 100644 --- a/subpages/mine/pages/eventDetail/eventDetail.wxml +++ b/subpages/mine/pages/eventDetail/eventDetail.wxml @@ -1,3 +1,4 @@ + @@ -24,6 +25,7 @@ class="image-item" src="{{item}}" /> + {{filter.getTags(eventObj.tagNames)}} diff --git a/subpages/mine/pages/eventDetail/eventDetail.wxss b/subpages/mine/pages/eventDetail/eventDetail.wxss index 2dddf07..11471ba 100644 --- a/subpages/mine/pages/eventDetail/eventDetail.wxss +++ b/subpages/mine/pages/eventDetail/eventDetail.wxss @@ -1,7 +1,7 @@ page { width: 100%; min-height: 100vh; - height: auto; + /* height: auto; */ overflow-y: auto; } .event-detail { @@ -74,6 +74,11 @@ page { .event-content .image-list .image-item + .image-item { margin-top: 20rpx; } +.event-content .tags { + color: #FFB400; + font-size: 28rpx; + margin-bottom: 20rpx; +} .handle-progress { width: 100%; diff --git a/utils/config.js b/utils/config.js index 58acdf1..8e613df 100644 --- a/utils/config.js +++ b/utils/config.js @@ -6,14 +6,14 @@ 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 'http://10.10.10.63:9094/epdc-api/api/' + // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 + // return 'http://192.168.43.19:9094/epdc-api/api/' } function WEBROOT() { diff --git a/utils/filter.wxs b/utils/filter.wxs index b377d7f..9a3ff94 100644 --- a/utils/filter.wxs +++ b/utils/filter.wxs @@ -23,6 +23,12 @@ var formatTime = function (strDate, format = "yyyy-MM-dd hh:mm:ss") { } return format; } + +var getTags = function (tags=[]) { + return tags.join(' ') +} + module.exports = { formatTime: formatTime,//日期格式化 + getTags: getTags } \ No newline at end of file From 3c699df84b321d8a2b8450b7cf17c62655088174 Mon Sep 17 00:00:00 2001 From: lihenian <2629534615@qq.com> Date: Fri, 4 Sep 2020 09:00:33 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=89=88=E6=9C=AC1.4.33=20=E6=88=91?= =?UTF-8?q?=E6=9C=89=E4=BA=8B=E8=AF=B4=E5=A2=9E=E5=8A=A0=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=EF=BC=9B=E8=AE=AE=E9=A2=98=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/toRegister/toRegister.js | 2 +- project.config.json | 284 ++++++++++++++++----------------- utils/config.js | 4 +- 3 files changed, 145 insertions(+), 145 deletions(-) diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index 3e20967..9398bbf 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.4.32" + const versionNum = "1.4.33" 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 0e8739b..4669972 100644 --- a/project.config.json +++ b/project.config.json @@ -1,144 +1,144 @@ { - "description": "项目配置文件", - "packOptions": { - "ignore": [] - }, - "setting": { - "urlCheck": false, - "es6": true, - "postcss": true, - "preloadBackgroundData": false, - "minified": true, - "newFeature": true, - "coverView": true, - "autoAudits": false, - "showShadowRootInWxmlPanel": true, - "scopeDataCheck": false, - "checkInvalidKey": true, - "checkSiteMap": true, - "uploadWithSourceMap": true, - "compileHotReLoad": false, - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" - }, - "useIsolateContext": true, - "useCompilerModule": false, - "userConfirmedUseCompilerModuleSwitch": false - }, - "compileType": "miniprogram", - "libVersion": "2.8.2", - "appid": "wx6dcf544cdae7d4ec", - "projectname": "%E7%B2%BE%E8%87%B4%E9%94%A6%E6%B0%B4-%E5%B1%85%E6%B0%9 1%E7%AB%AF", - "debugOptions": { - "hidedInDevtools": [] - }, - "isGameTourist": false, - "simulatorType": "wechat", - "simulatorPluginLibVersion": {}, - "condition": { - "search": { - "current": -1, - "list": [] - }, - "conversation": { - "current": -1, - "list": [] - }, - "plugin": { - "current": -1, - "list": [] - }, - "game": { - "currentL": -1, - "list": [] - }, - "gamePlugin": { - "current": -1, - "list": [] - }, - "miniprogram": { - "current": -1, - "list": [ - { - "id": 0, - "name": "pages/formid/formid", - "pathName": "pages/formid/formid", - "query": "gid=1233592630168813569", - "scene": 1011 - }, - { - "id": 1, - "name": "pages/indexNew/indexNew", - "pathName": "pages/indexNew/indexNew", - "query": "scene=1233592247862198274", - "scene": 1011 - }, - { - "id": 2, - "name": "网格长注册", - "pathName": "pages/index/index", - "query": "scene=gridLeader", - "scene": 1011 - }, - { - "id": 3, - "name": "subpages/home/pages/newsDetail/newsDetail", - "pathName": "subpages/home/pages/newsDetail/newsDetail", - "query": "id=7c8bc749ff4b6380bf1d902c0bde0ba&defaultGridId=1233592630168813569", - "scene": null - }, - { - "id": -1, - "name": "社群列表", - "pathName": "subpages/associationNew/pages/associationlist/associationlist", - "query": "", - "scene": null - }, - { - "id": 5, - "name": "数据端跳转", - "pathName": "pages/indexNew/indexNew", - "query": "scene=1277169327606366209&from=analysis", - "scene": null - }, - { - "id": 6, - "name": "工作端跳转", - "pathName": "pages/indexNew/indexNew", - "query": "scene=1280737901335838721&from=work", - "scene": null - }, - { - "id": 7, - "name": "我有事说", - "pathName": "subpages/discussion/pages/addIssue/addIssue", - "query": "", - "scene": null - }, - { - "id": 8, - "name": "搜索页面", - "pathName": "subpages/oneKeyService/pages/search/search", - "query": "", - "scene": null - }, - { - "id": -1, - "name": "注册页面", - "pathName": "pages/toRegister/toRegister", - "query": "", - "scene": null - }, - { - "id": -1, - "name": "subpages/heart/pages/leaderboardNew/leaderboardNew", - "pathName": "subpages/heart/pages/leaderboardNew/leaderboardNew", - "query": "", - "scene": null - } - ] - } - } + "description": "项目配置文件", + "packOptions": { + "ignore": [] + }, + "setting": { + "urlCheck": false, + "es6": true, + "postcss": true, + "preloadBackgroundData": false, + "minified": true, + "newFeature": true, + "coverView": true, + "autoAudits": false, + "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, + "checkInvalidKey": true, + "checkSiteMap": true, + "uploadWithSourceMap": true, + "compileHotReLoad": false, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + }, + "useIsolateContext": true, + "useCompilerModule": false, + "userConfirmedUseCompilerModuleSwitch": false + }, + "compileType": "miniprogram", + "libVersion": "2.8.2", + "appid": "wx6dcf544cdae7d4ec", + "projectname": "%E7%B2%BE%E8%87%B4%E9%94%A6%E6%B0%B4-%E5%B1%85%E6%B0%9 1%E7%AB%AF", + "debugOptions": { + "hidedInDevtools": [] + }, + "isGameTourist": false, + "simulatorType": "wechat", + "simulatorPluginLibVersion": {}, + "condition": { + "search": { + "current": -1, + "list": [] + }, + "conversation": { + "current": -1, + "list": [] + }, + "plugin": { + "current": -1, + "list": [] + }, + "game": { + "currentL": -1, + "list": [] + }, + "gamePlugin": { + "current": -1, + "list": [] + }, + "miniprogram": { + "current": -1, + "list": [ + { + "id": 0, + "name": "pages/formid/formid", + "pathName": "pages/formid/formid", + "query": "gid=1233592630168813569", + "scene": 1011 + }, + { + "id": 1, + "name": "pages/indexNew/indexNew", + "pathName": "pages/indexNew/indexNew", + "query": "scene=1233592247862198274", + "scene": 1011 + }, + { + "id": 2, + "name": "网格长注册", + "pathName": "pages/index/index", + "query": "scene=gridLeader", + "scene": 1011 + }, + { + "id": 3, + "name": "subpages/home/pages/newsDetail/newsDetail", + "pathName": "subpages/home/pages/newsDetail/newsDetail", + "query": "id=7c8bc749ff4b6380bf1d902c0bde0ba&defaultGridId=1233592630168813569", + "scene": null + }, + { + "id": -1, + "name": "社群列表", + "pathName": "subpages/associationNew/pages/associationlist/associationlist", + "query": "", + "scene": null + }, + { + "id": 5, + "name": "数据端跳转", + "pathName": "pages/indexNew/indexNew", + "query": "scene=1277169327606366209&from=analysis", + "scene": null + }, + { + "id": 6, + "name": "工作端跳转", + "pathName": "pages/indexNew/indexNew", + "query": "scene=1280737901335838721&from=work", + "scene": null + }, + { + "id": 7, + "name": "我有事说", + "pathName": "subpages/discussion/pages/addIssue/addIssue", + "query": "", + "scene": null + }, + { + "id": 8, + "name": "搜索页面", + "pathName": "subpages/oneKeyService/pages/search/search", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "注册页面", + "pathName": "pages/toRegister/toRegister", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "subpages/heart/pages/leaderboardNew/leaderboardNew", + "pathName": "subpages/heart/pages/leaderboardNew/leaderboardNew", + "query": "", + "scene": null + } + ] + } + } } \ No newline at end of file diff --git a/utils/config.js b/utils/config.js index 8e613df..6dc8726 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://192.168.43.19:9094/epdc-api/api/' }