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 @@ >
- -

{{ $L(item.label) }}

-
- - + +

{{ $L(item.label) }}

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; + } } } }