From ced25e0cd24bceceb9a7b32fb371326c1d1c05c6 Mon Sep 17 00:00:00 2001
From: wfs <605403358>
Date: Wed, 14 Aug 2024 00:24:49 +0800
Subject: [PATCH] =?UTF-8?q?perf:=201.=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E5=AE=A1=E6=89=B9=E4=BA=BA=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E8=BF=87=E5=90=8E=E8=87=AA=E5=8A=A8=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=20=202.=20=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA=E5=9B=BE=E7=89=87=E5=8F=AF=E4=BB=A5=E5=B7=A6=E5=8F=B3?=
 =?UTF-8?q?=E6=BB=91=E5=8A=A8=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                            |  2 +-
 .../js/pages/manage/approve/details.vue       | 20 +++++++++++++++----
 resources/views/push/bot.blade.php            |  4 ----
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 53386c3af..45c289978 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -149,7 +149,7 @@ services:
 
   approve:
     container_name: "dootask-approve-${APP_ID}"
-    image: "kuaifan/dooapprove:0.0.11"
+    image: "kuaifan/dooapprove:0.0.12"
     environment:
       TZ: "${TIMEZONE:-PRC}"
       MYSQL_HOST: "${DB_HOST}"
diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue
index cf62da9cc..c4cef6b7b 100644
--- a/resources/assets/js/pages/manage/approve/details.vue
+++ b/resources/assets/js/pages/manage/approve/details.vue
@@ -54,7 +54,7 @@
             <div class="approve-details-text"  v-if="datas.var?.other">
                 <h4>{{$L('图片')}}</h4>
                 <div class="img-body">
-                    <div v-for="(src,key) in (datas.var.other).split(',') " @click="onViewPicture(src)">
+                    <div v-for="(src,key) in (datas.var.other).split(',')" @click="onViewPicture(src, datas.var.other, 1)">
                         <ImgView :src="src" :key="key" class="img-view"/>
                     </div>
                 </div>
@@ -164,7 +164,7 @@
                                     {{ getContent(item.content) }}
                                 </div>
                                 <div class="content" style="display: flex; gap: 10px;">
-                                    <div v-for="(src,k) in getPictures(item.content)" :key="k"  @click="onViewPicture(src)">
+                                    <div v-for="(src,k) in getPictures(item.content)" :key="k"  @click="onViewPicture(src, item.content, 2)">
                                         <ImgView :src="src" class="img-view"/>
                                     </div>
                                 </div>
@@ -475,8 +475,20 @@ export default {
             }
         },
         // 打开图片
-        onViewPicture(currentUrl) {
-            this.$store.dispatch("previewImage", $A.mainUrl(currentUrl))
+        onViewPicture(currentUrl, datas, type) {
+            if (type == 1) {
+                datas = datas.split(',')
+            }
+            if (type == 2) {
+                datas = this.getPictures(datas)
+            }
+            const list = datas.map(src => {
+                return {
+                    src: $A.mainUrl(src)
+                }
+            });
+            const index = list.findIndex(({ src }) => src === $A.mainUrl(currentUrl));
+            this.$store.dispatch("previewImage", { index, list })
         }
     }
 }
diff --git a/resources/views/push/bot.blade.php b/resources/views/push/bot.blade.php
index 4df84e457..a1a9bda71 100755
--- a/resources/views/push/bot.blade.php
+++ b/resources/views/push/bot.blade.php
@@ -159,11 +159,7 @@
         <span>[图片]</span>
         @endif
     </div><div class="btn-raw no-dark-content">
-        @if ($is_finished == 1)
-        <button class="ivu-btn ivu-btn-grey">已同意</button>
-        @else
         <button class="ivu-btn ivu-btn-grey">查看详情</button>
-        @endif
     </div></span>
 @elseif ($type === 'approve_submitter')
     <span class="open-approve-details" data-id="{{$data->id}}"><b>@if ($action === 'pass')您发起的「{{$data->proc_def_name}}」已通过 @else您发起的「{{$data->proc_def_name}}」被{{$data->nickname}}拒绝 @endif</b>