From a743dbd6dfbfbc2c3e8cbd392d7c87e8ed32d91d Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 24 Dec 2021 21:37:51 +0800
Subject: [PATCH 1/2] =?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 @@
         <div class="time-select">
           <span>{{item.name}}</span>
           <u-icon name="arrow-down" color="#333" size="16" />
+          <span class="edit-btn" @click="editClick(editText)">{{editText}}</span>
         </div>
         <div class="img-list">
           <div class="img-item" v-for="(e, indexs) in item.list" :key="indexs">
             <p>{{e.createUserName}} 上传</p>
             <img :src="e.url" alt="" @click.stop="previewImage(item.list, e.url)">
+            <span class="cir-icon" v-if="editText== '取消' && !i.isCheked" @click="checkImg(e, index, indexs)"></span>
+            <u-icon name="checkmark-circle-fill" color="#26f" size="40" class="del-icon" @click="delSelect(e, index, indexs)" v-if="editText== '取消' && i.isCheked"></u-icon>
           </div>
         </div>
       </div>
     </div>
     
-    <div class="footer-btn" @click="uploadImg">上传图片</div>
+    <div class="footer-btn" @click="uploadImg" v-if="editText == '编辑' ">上传图片</div>
+    <div class="footer-btn" @click="del" v-if="editText == '取消' ">确定</div>
   </div>
 </template>
 
@@ -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 <liuye@sinoecare.com>
Date: Fri, 24 Dec 2021 21:54:34 +0800
Subject: [PATCH 2/2] =?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 @@
           <div class="img-item" v-for="(e, indexs) in item.list" :key="indexs">
             <p>{{e.createUserName}} 上传</p>
             <img :src="e.url" alt="" @click.stop="previewImage(item.list, e.url)">
-            <span class="cir-icon" v-if="editText== '取消' && !i.isCheked" @click="checkImg(e, index, indexs)"></span>
-            <u-icon name="checkmark-circle-fill" color="#26f" size="40" class="del-icon" @click="delSelect(e, index, indexs)" v-if="editText== '取消' && i.isCheked"></u-icon>
+            <span class="cir-icon" v-if="editText== '取消' && !e.isCheked" @click="checkImg(e, index, indexs)"></span>
+            <u-icon name="checkmark-circle-fill" color="#26f" size="54" class="del-icon" @click="delSelect(e, index, indexs)" v-if="editText== '取消' && e.isCheked"></u-icon>
           </div>
         </div>
       </div>
     </div>
     
     <div class="footer-btn" @click="uploadImg" v-if="editText == '编辑' ">上传图片</div>
-    <div class="footer-btn" @click="del" v-if="editText == '取消' ">确定</div>
+    <div class="footer-btn" @click="delConfirm" v-if="editText == '取消'">确定</div>
   </div>
 </template>
 
@@ -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({