From 82169094e4d27ca4896cc57d01632b1c976040e7 Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 5 May 2023 14:02:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mods/conv/score/AppIntegralApply/add.vue | 2 +- .../AppCommunityInfo.vue | 2 +- .../AppPartyEnteringCommunity.vue} | 199 ++++++----- .../custom.png | Bin .../custom_selected.png | Bin .../wuxi/AppPhotoReport/AppPhotoReport.vue | 215 ++++++++++++ .../wuxi/AppPhotoReport/PhotoDetail.vue | 181 ++++++++++ src/project/wuxi/AppPhotoReport/PhotoForm.vue | 330 ++++++++++++++++++ .../wuxi/AppPhotoReport/PhotoResult.vue | 64 ++++ 9 files changed, 912 insertions(+), 81 deletions(-) rename src/project/wuxi/{AppEnteringCommunity => AppPartyEnteringCommunity}/AppCommunityInfo.vue (96%) rename src/project/wuxi/{AppEnteringCommunity/AppEnteringCommunity.vue => AppPartyEnteringCommunity/AppPartyEnteringCommunity.vue} (87%) rename src/project/wuxi/{AppEnteringCommunity => AppPartyEnteringCommunity}/custom.png (100%) rename src/project/wuxi/{AppEnteringCommunity => AppPartyEnteringCommunity}/custom_selected.png (100%) create mode 100644 src/project/wuxi/AppPhotoReport/AppPhotoReport.vue create mode 100644 src/project/wuxi/AppPhotoReport/PhotoDetail.vue create mode 100644 src/project/wuxi/AppPhotoReport/PhotoForm.vue create mode 100644 src/project/wuxi/AppPhotoReport/PhotoResult.vue diff --git a/src/mods/conv/score/AppIntegralApply/add.vue b/src/mods/conv/score/AppIntegralApply/add.vue index 68a2064..6dc3845 100644 --- a/src/mods/conv/score/AppIntegralApply/add.vue +++ b/src/mods/conv/score/AppIntegralApply/add.vue @@ -61,7 +61,7 @@ export default { forms: { phone: '', auditTime: '', - // applyIntegralType: '', + applyIntegralType: '', applyIntegralTypeValue: '', description: '', applyFiles: [], diff --git a/src/project/wuxi/AppEnteringCommunity/AppCommunityInfo.vue b/src/project/wuxi/AppPartyEnteringCommunity/AppCommunityInfo.vue similarity index 96% rename from src/project/wuxi/AppEnteringCommunity/AppCommunityInfo.vue rename to src/project/wuxi/AppPartyEnteringCommunity/AppCommunityInfo.vue index 9a63479..c63943a 100644 --- a/src/project/wuxi/AppEnteringCommunity/AppCommunityInfo.vue +++ b/src/project/wuxi/AppPartyEnteringCommunity/AppCommunityInfo.vue @@ -28,7 +28,7 @@ export default { onLoad(query) { if (query.type !== '0') { uni.setNavigationBarTitle({ - title: '社区公约' + title: query.type == 4 ? '社区公约' : '党员阵地' }) } diff --git a/src/project/wuxi/AppEnteringCommunity/AppEnteringCommunity.vue b/src/project/wuxi/AppPartyEnteringCommunity/AppPartyEnteringCommunity.vue similarity index 87% rename from src/project/wuxi/AppEnteringCommunity/AppEnteringCommunity.vue rename to src/project/wuxi/AppPartyEnteringCommunity/AppPartyEnteringCommunity.vue index fd3ee08..fe3d6cc 100644 --- a/src/project/wuxi/AppEnteringCommunity/AppEnteringCommunity.vue +++ b/src/project/wuxi/AppPartyEnteringCommunity/AppPartyEnteringCommunity.vue @@ -1,8 +1,10 @@ @@ -92,8 +108,8 @@ import {mapActions, mapState} from 'vuex' export default { - name: "AppEnteringCommunity", - appName: "社区", + name: "AppPartyEnteringCommunity", + appName: "党建社区", customNavigation: true, data() { return { @@ -103,20 +119,27 @@ export default { areaName: '', areaId: '', $areaId: '', + albumList: [], activityList: [], publicList: [], moduleId: "", isInit: false } }, + onLoad() { this.areaId = this.$mp.query.areaId || this.$areaId this.areaName = this.$mp.query.areaName || this.$areaName this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight this.autoLogin() + this.$nextTick(() => { - this.getActiveList() this.getName() + this.getAlbumList() + this.getActiveList() + }) + uni.$on('update', () => { + this.getAlbumList() }) }, @@ -161,14 +184,17 @@ export default { } }) }, + updateUserInfo() { if (this.areaId.endsWith('000')) { this.$dialog.alert({ content: '请选择村' }).then(() => { }) + return false } + this.$instance.post("/app/appwechatuser/updateById", { id: this.user.id, homeArea: this.areaId, @@ -216,11 +242,26 @@ export default { this.$nextTick(() => { this.getActiveList() + this.getAlbumList() this.getPublicList() uni.setStorageSync('areaId', this.areaId) uni.setStorageSync('areaName', this.areaName) }) }, + + getAlbumList() { + this.$instance.post(`/app/appvillagepicturealbum/queryAlbumMenu?areaId=${this.areaId}`).then(res => { + if (res.code == 0) { + this.albumList = res.data.map(v => { + return { + ...v, + coverImg: `${this.$cdn}/dvcp/album/album${v.type}.png` + } + }) + } + }) + }, + getActiveList() { this.$instance.post(`/app/appvillageactivityinfo/listUp`, null, { params: { @@ -243,8 +284,8 @@ export default { onShareAppMessage() { return { - title: '欢迎使用数字乡村治理服务一体化平台~', - path: `/pages/AppEnteringCommunity/AppEnteringCommunity` + title: '欢迎使用数字党建平昌~', + path: `/pages/AppPartyEnteringCommunity/AppPartyEnteringCommunity` } }, @@ -255,7 +296,7 @@ export default { diff --git a/src/project/wuxi/AppPhotoReport/PhotoDetail.vue b/src/project/wuxi/AppPhotoReport/PhotoDetail.vue new file mode 100644 index 0000000..3dce1fa --- /dev/null +++ b/src/project/wuxi/AppPhotoReport/PhotoDetail.vue @@ -0,0 +1,181 @@ + + + + + diff --git a/src/project/wuxi/AppPhotoReport/PhotoForm.vue b/src/project/wuxi/AppPhotoReport/PhotoForm.vue new file mode 100644 index 0000000..456d60b --- /dev/null +++ b/src/project/wuxi/AppPhotoReport/PhotoForm.vue @@ -0,0 +1,330 @@ + + + + + diff --git a/src/project/wuxi/AppPhotoReport/PhotoResult.vue b/src/project/wuxi/AppPhotoReport/PhotoResult.vue new file mode 100644 index 0000000..18aeed6 --- /dev/null +++ b/src/project/wuxi/AppPhotoReport/PhotoResult.vue @@ -0,0 +1,64 @@ + + + + +