From 4f676c0ccb821a46ad396befc2ab035834553376 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Mon, 11 Sep 2023 16:09:49 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A1.=20Okr=20=E6=B7=BB=E5=8A=A0esc?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=AA=97=E5=8F=A3=202.=20Okr=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=203.=20=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8=E6=BC=8F=E6=B4=9E-?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=9A=84=E5=93=8D=E5=BA=94=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=9A=B4=E9=9C=B2=E4=BA=86=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/AbstractModel.php                    |  4 ++--
 docker-compose.yml                              |  2 +-
 resources/assets/js/app.js                      |  2 ++
 .../assets/js/pages/manage/application.vue      | 12 +++++++-----
 resources/assets/sass/pages/page-apply.scss     | 17 ++++++++++++++---
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/app/Models/AbstractModel.php b/app/Models/AbstractModel.php
index 6e6c85e23..3fdf1d821 100644
--- a/app/Models/AbstractModel.php
+++ b/app/Models/AbstractModel.php
@@ -236,10 +236,10 @@ class AbstractModel extends Model
                 info($eb);
             }
             if ($e instanceof ApiException) {
-                throw new ApiException($e->getMessage(), $e->getData(), $e->getCode());
+                throw new ApiException( config('app.debug') ? $e->getMessage() : '处理错误', $e->getData(), $e->getCode());
             } else {
                 info($e);
-                throw new ApiException($e->getMessage() ?: '处理错误');
+                throw new ApiException( config('app.debug') ? ($e->getMessage() ?: '处理错误') : '处理错误');
             }
         }
     }
diff --git a/docker-compose.yml b/docker-compose.yml
index 0403635b9..c39ba37b8 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -176,7 +176,7 @@ services:
 
   okr:
     container_name: "dootask-okr-${APP_ID}"
-    image: "kuaifan/doookr:0.0.10"
+    image: "kuaifan/doookr:0.0.11"
     environment:
       TZ: "${TIMEZONE:-PRC}"
       DOO_TASK_URL: "http://${APP_IPPR}.3"
diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index 958a25038..55a7f458e 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -143,6 +143,8 @@ Vue.prototype.goBack = function () {
         app.$store.state.routeHistorys.pop();
         const length = app.$store.state.routeHistorys.length;
         app.$store.state.routeHistoryLast = length >= 2 ? app.$store.state.routeHistorys[length - 2] : {};
+    } else if (app.$route.name == 'manage-apps') {
+        app.$router.back();
     } else {
         app.$router.replace({path: '/'}).catch(_ => {});
         app.$store.state.routeHistorys = [];
diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue
index a724316c0..08eedabf0 100644
--- a/resources/assets/js/pages/manage/application.vue
+++ b/resources/assets/js/pages/manage/application.vue
@@ -25,12 +25,14 @@
                         >
                             <div class="apply-col">
                                 <div @click="applyClick(item)">
-                                    <img :src="getLogoPath(item.value)" />
-                                    <p>{{ $L(item.label) }}</p>
-                                    <div @click.stop="applyClick(item, 'badge')" class="apply-box-top-report">
-                                        <Badge v-if="showBadge(item,'approve')" :overflow-count="999" :count="approveUnreadNumber" />
-                                        <Badge v-if="showBadge(item,'report')" :overflow-count="999" :count="reportUnreadNumber" />
+                                    <div class="logo">
+                                        <img :src="getLogoPath(item.value)" />
+                                        <div @click.stop="applyClick(item, 'badge')" class="apply-box-top-report">
+                                            <Badge v-if="showBadge(item,'approve')" :overflow-count="999" :count="approveUnreadNumber" />
+                                            <Badge v-if="showBadge(item,'report')" :overflow-count="999" :count="reportUnreadNumber" />
+                                        </div>
                                     </div>
+                                    <p>{{ $L(item.label) }}</p>
                                 </div>
                             </div>
                         </Col>
diff --git a/resources/assets/sass/pages/page-apply.scss b/resources/assets/sass/pages/page-apply.scss
index bb46822fe..483d5f94f 100644
--- a/resources/assets/sass/pages/page-apply.scss
+++ b/resources/assets/sass/pages/page-apply.scss
@@ -63,9 +63,14 @@
                     position: relative;
                     border: 1px solid #f1f1f1;
 
-                    >img {
+                    >.logo {
                         width: 40px;
                         height: 40px;
+                        display: inline-block;
+                        >img{
+                            width: 100%;
+                            height: 100%;
+                        }
                     }
                 
                     >p{
@@ -110,13 +115,19 @@
                         background: none;
                         border-color: #ffffff;
 
-                        >img {
-                            margin-bottom: 5px;
+                        .logo {
+                            margin-bottom: 8px;
+                            position: relative;
                         }
 
                         >p{
                             -webkit-line-clamp: 1;
                         }
+
+                        .apply-box-top-report {
+                            right: -20px;
+                            top: -20px;
+                        }
                     }
                 }
             }