From a743dbd6dfbfbc2c3e8cbd392d7c87e8ed32d91d Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 24 Dec 2021 21:37:51 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=B8=89=E4=BC=9A=E4=B8=80=E8=AF=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppCountryAlbum/detail.vue | 78 ++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/src/apps/AppCountryAlbum/detail.vue b/src/apps/AppCountryAlbum/detail.vue index 664289c4..77244098 100644 --- a/src/apps/AppCountryAlbum/detail.vue +++ b/src/apps/AppCountryAlbum/detail.vue @@ -27,17 +27,21 @@
{{item.name}} + {{editText}}

{{e.createUserName}} 上传

+ +
-
上传图片
+
上传图片
+
确定
@@ -52,6 +56,8 @@ export default { fileList: [], numInfo: {}, params: {}, + editText: '编辑', + delIds: [] } }, computed: { ...mapState(['user']) }, @@ -66,6 +72,42 @@ export default { }, methods: { + del() { + if(!this.ids) { + return this.$u.toast('请先选中需要删除的照片') + } + var id = this.ids.jion(',') + this.$confirm('确定删除这些相片?').then(() => { + this.$http.post(`/app/appvillagepicturealbum/deleteForWx?id=${id}`).then((res) => { + if (res.code == 0) { + this.$u.toast('删除成功！') + this.list = [] + this.getList() + this.editClick('取消') + } + }) + }) + }, + editClick(text) { + this.editText = text == '编辑' ? '取消' : '编辑' + this.delIds = [] + if(text == '取消') { + this.list = [] + this.getList() + } + }, + checkImg(row, index, indexs) { + this.list[index].list[indexs].isCheked = true + this.delIds.push(row.id) + }, + delSelect(row, index, indexs) { + this.list[index].list[indexs].isCheked = false + this.delIds.map((item, i) => { + if(item == row.id) { + this.delIds.splice(i, 1) + } + }) + }, previewImage(images, img) { uni.previewImage({ urls: images.map(v => v.url), @@ -80,12 +122,17 @@ export default { } }).then(res => { if (res.code == 0) { - this.list = Object.keys(res.data).map(v => { + this.list = Object.keys(res.data).map(v => { return { name: v, list: res.data[v] } }) + this.list.map((item) => { + item.list.map((e) => { + e.isCheked = false + }) + }) } }) }, @@ -228,10 +275,23 @@ export default { font-family: PingFangSC-Semibold, PingFang SC; font-weight: 600; color: #333; + position: relative; span{ display: inline-block; margin-right: 16px; } + .edit-btn{ + display: inline-block; + color: #26f; + font-weight: 400; + width: 200px; + text-align: right; + line-height: 88px; + position: absolute; + font-size: 32px; + right: 18px; + top: 20px; + } } .img-list{ overflow: hidden; @@ -256,6 +316,20 @@ export default { color: #FFF; line-height: 36px; } + .del-icon{ + position: absolute; + right: 0; + top: 0; + } + .cir-icon{ + width: 40px; + height: 40px; + border-radius: 50%; + border: 4px solid #ccc; + position: absolute; + right: 0; + top: 0; + } } } .footer-btn{ From 591dc206bc65392bc187952a9c801ddd23176e55 Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 24 Dec 2021 21:54:34 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E7=9B=B8=E5=86=8C=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppCountryAlbum/detail.vue | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/apps/AppCountryAlbum/detail.vue b/src/apps/AppCountryAlbum/detail.vue index 77244098..092c377e 100644 --- a/src/apps/AppCountryAlbum/detail.vue +++ b/src/apps/AppCountryAlbum/detail.vue @@ -33,15 +33,15 @@

{{e.createUserName}} 上传

- - + +
上传图片
-
确定
+
确定
@@ -72,18 +72,20 @@ export default { }, methods: { - del() { - if(!this.ids) { + delConfirm() { + if(!this.delIds.length) { return this.$u.toast('请先选中需要删除的照片') } - var id = this.ids.jion(',') + var id = this.delIds.join(',') this.$confirm('确定删除这些相片?').then(() => { - this.$http.post(`/app/appvillagepicturealbum/deleteForWx?id=${id}`).then((res) => { + this.$http.post(`/app/appvillagepicturealbum/delete?ids=${id}`).then((res) => { if (res.code == 0) { this.$u.toast('删除成功！') this.list = [] this.getList() + this.getStatistic() this.editClick('取消') + uni.$emit('updateList') } }) }) @@ -91,7 +93,7 @@ export default { editClick(text) { this.editText = text == '编辑' ? '取消' : '编辑' this.delIds = [] - if(text == '取消') { + if(text == '取消' && this.delIds.length) { this.list = [] this.getList() } @@ -99,6 +101,7 @@ export default { checkImg(row, index, indexs) { this.list[index].list[indexs].isCheked = true this.delIds.push(row.id) + this.$forceUpdate() }, delSelect(row, index, indexs) { this.list[index].list[indexs].isCheked = false @@ -107,6 +110,7 @@ export default { this.delIds.splice(i, 1) } }) + this.$forceUpdate() }, previewImage(images, img) { uni.previewImage({ From c269905607beb292e2cae556c7625174897135a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Fri, 24 Dec 2021 21:54:42 +0800 Subject: [PATCH 03/11] 25939 --- src/apps/AppResidentActivitie/Detail.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/apps/AppResidentActivitie/Detail.vue b/src/apps/AppResidentActivitie/Detail.vue index c1df92ec..344f425e 100644 --- a/src/apps/AppResidentActivitie/Detail.vue +++ b/src/apps/AppResidentActivitie/Detail.vue @@ -13,10 +13,10 @@
{{ $dict.getLabel('villageActivityStatus', detail.status) }}
- - + + - {{ detail.contactPerson }} + {{ detail.createUserName }}
From 73871d5830d78d38ea5120bbbe04bbc933a1e3b0 Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 24 Dec 2021 22:00:36 +0800 Subject: [PATCH 04/11] 26037 --- src/apps/AppPartyHistoryEducation/AppPartyHistoryEducation.vue | 3 +++ src/apps/AppPartyHistoryEducation/videoDetail.vue | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/apps/AppPartyHistoryEducation/AppPartyHistoryEducation.vue b/src/apps/AppPartyHistoryEducation/AppPartyHistoryEducation.vue index 77a0d4a1..54c3fd90 100644 --- a/src/apps/AppPartyHistoryEducation/AppPartyHistoryEducation.vue +++ b/src/apps/AppPartyHistoryEducation/AppPartyHistoryEducation.vue @@ -84,6 +84,9 @@ export default { this.getClassList() this.getKnowledgeList() }, + onShow() { + document.title = '党员学习' + }, methods: { getTodayList() { this.$http.post(`/app/apppartyeducation/list?style=2&size=1&status=1`).then((res) => { diff --git a/src/apps/AppPartyHistoryEducation/videoDetail.vue b/src/apps/AppPartyHistoryEducation/videoDetail.vue index 1d5872f5..207ba3ed 100644 --- a/src/apps/AppPartyHistoryEducation/videoDetail.vue +++ b/src/apps/AppPartyHistoryEducation/videoDetail.vue @@ -51,6 +51,9 @@ export default { this.getClassDetail() this.getVideoList() }, + onShow() { + document.title = '党员学习' + }, methods: { change(index) { this.current = index; From 5f291422ec53ef09383fbd6b97f4f11147c3ddcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Fri, 24 Dec 2021 22:00:53 +0800 Subject: [PATCH 05/11] bug --- src/apps/AppResidentActivitie/Add.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/apps/AppResidentActivitie/Add.vue b/src/apps/AppResidentActivitie/Add.vue index 8bf374db..13a8c913 100644 --- a/src/apps/AppResidentActivitie/Add.vue +++ b/src/apps/AppResidentActivitie/Add.vue @@ -181,6 +181,8 @@ export default { contactPerson: this.forms.contactPerson, contactPhone: this.forms.contactPhone, + createUserName: this.user.name, + createUserId: this.user.id, id: this.id, }) .then((res) => { From e664741f1bd7b4a1486e59f133ad579dfd29a29e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?= =?UTF-8?q?=E9=98=B4?= <185154740@qq.com> Date: Fri, 24 Dec 2021 22:04:09 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppResidentActivitie/Add.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/apps/AppResidentActivitie/Add.vue b/src/apps/AppResidentActivitie/Add.vue index 13a8c913..26100355 100644 --- a/src/apps/AppResidentActivitie/Add.vue +++ b/src/apps/AppResidentActivitie/Add.vue @@ -183,6 +183,7 @@ export default { contactPhone: this.forms.contactPhone, createUserName: this.user.name, createUserId: this.user.id, + avatar: this.user.avatar, id: this.id, }) .then((res) => { From 01ab552a09dd7d63a650b797c9e3a1ec71c3a932 Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 24 Dec 2021 22:19:47 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=9F=BA=E5=B1=82=E5=85=9A=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppPageParty/AppPageParty.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps/AppPageParty/AppPageParty.vue b/src/apps/AppPageParty/AppPageParty.vue index 7d754934..e79d74e3 100644 --- a/src/apps/AppPageParty/AppPageParty.vue +++ b/src/apps/AppPageParty/AppPageParty.vue @@ -27,13 +27,13 @@ export default { { name: '党员学习', icon: require('./img/dyxx.png'), - url: '../party/AppPartyHistoryEducation/classroomList', + url: '../AppPartyHistoryEducation/classroomList', isBottom: true }, { name: '在线答题', icon: require('./img/zxdt.png'), - url: '../party/AppOnlineAnswer/AppOnlineAnswer' + url: '../AppOnlineAnswer/AppOnlineAnswer' } ], headerBg: require('./img/header-bg.png'), From 5859ee6bb83cab0bf6d015a8b6ffe284cdf78a16 Mon Sep 17 00:00:00 2001 From: liuye Date: Fri, 24 Dec 2021 22:34:18 +0800 Subject: [PATCH 08/11] bug --- src/apps/AppBuilding/components/searchMap.vue | 12 ++++++------ src/apps/AppCountryAlbum/detail.vue | 2 +- src/apps/AppOnlineAnswer/AppOnlineAnswer.vue | 17 ++++++++++------- .../AppPartyHistoryEducation/classroomList.vue | 3 +++ 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/apps/AppBuilding/components/searchMap.vue b/src/apps/AppBuilding/components/searchMap.vue index 155013f7..1c7dc1de 100644 --- a/src/apps/AppBuilding/components/searchMap.vue +++ b/src/apps/AppBuilding/components/searchMap.vue @@ -1,21 +1,21 @@ diff --git a/src/apps/AppOnlineAnswer/AppOnlineAnswer.vue b/src/apps/AppOnlineAnswer/AppOnlineAnswer.vue index d08f8f7c..7143d90a 100644 --- a/src/apps/AppOnlineAnswer/AppOnlineAnswer.vue +++ b/src/apps/AppOnlineAnswer/AppOnlineAnswer.vue @@ -1,7 +1,7 @@