diff --git a/app/Http/Controllers/Api/ComplaintController.php b/app/Http/Controllers/Api/ComplaintController.php
index 4b4c55d89..b2836ab9b 100755
--- a/app/Http/Controllers/Api/ComplaintController.php
+++ b/app/Http/Controllers/Api/ComplaintController.php
@@ -117,7 +117,7 @@ class ComplaintController extends AbstractController
                         'type' => 'content',
                         'title' => '收到新的举报信息',
                         'content' => "收到新的举报信息：{$reason} (请前往应用查看详情)"
-                    ], $botUser->userid);   // todo 未能在任务end事件来发送任务
+                    ], $botUser->userid);
                 }
             });
         //
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index b6db1b0ae..4939ad351 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -501,7 +501,7 @@
             <template #footer>
                 <div class="dialog-wrapper-forward-footer" :class="{selected: !forwardSource}" @click="forwardSource = !forwardSource">
                     <Icon class="user-modal-icon" :type="forwardSource ? 'ios-radio-button-off' : 'ios-checkmark-circle'" />
-                    {{$L('不显示原发送者信息')}}
+                    <span class="forward-text-tip">{{$L('不显示原发送者信息')}}</span>
                 </div>
                 <Button type="primary" :loading="forwardLoad > 0" @click="onForwardAffirm">
                     {{$L('确定')}}
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 9a97c0906..f09a4cbbd 100755
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -80,9 +80,27 @@
                     <p v-if="taskDetail.id"><span>{{taskDetail.id}}</span></p>
                 </div>
                 <div class="function">
+                    <ETooltip v-if="$Electron" :disabled="$isEEUiApp || windowTouch" :content="$L('新窗口打开')">
+                        <i class="taskfont open" @click="openNewWin">&#xe776;</i>
+                    </ETooltip>
+                    <div class="menu">
+                        <TaskMenu
+                            :disabled="taskId === 0"
+                            :task="taskDetail"
+                            icon="ios-more"
+                            completed-icon="ios-more"
+                            size="medium"
+                            :color-show="false"
+                            @on-update="getLogLists"/>
+                    </div>
+                </div>
+            </div>
+            <Scrollbar ref="scroller" class="scroller">
+                <Alert v-if="getOwner.length === 0" class="receive-box" type="warning">
+                    <span class="receive-text">{{$L('该任务尚未被领取，点击这里')}}</span>
                     <EPopover
-                        v-if="getOwner.length === 0"
                         v-model="receiveShow"
+                        class="receive-button"
                         placement="bottom">
                         <div class="task-detail-receive">
                             <div class="receive-title">
@@ -101,28 +119,13 @@
                                     @on-change="taskTimeChange"/>
                             </div>
                             <div class="receive-bottom">
-                                <Button size="small" type="text" @click="receiveShow=false">取消</Button>
-                                <Button :loading="ownerLoad > 0" size="small" type="primary" @click="onOwner(true)">确定</Button>
+                                <Button size="small" type="text" @click="receiveShow=false">{{$L('取消')}}</Button>
+                                <Button :loading="ownerLoad > 0" size="small" type="primary" @click="onOwner(true)">{{$L('确定')}}</Button>
                             </div>
                         </div>
-                        <Button slot="reference" :loading="ownerLoad > 0" class="pick" type="primary">{{$L('我要领取任务')}}</Button>
+                        <Button slot="reference" :loading="ownerLoad > 0" size="small" type="primary">{{$L('领取任务')}}</Button>
                     </EPopover>
-                    <ETooltip v-if="$Electron" :disabled="$isEEUiApp || windowTouch" :content="$L('新窗口打开')">
-                        <i class="taskfont open" @click="openNewWin">&#xe776;</i>
-                    </ETooltip>
-                    <div class="menu">
-                        <TaskMenu
-                            :disabled="taskId === 0"
-                            :task="taskDetail"
-                            icon="ios-more"
-                            completed-icon="ios-more"
-                            size="medium"
-                            :color-show="false"
-                            @on-update="getLogLists"/>
-                    </div>
-                </div>
-            </div>
-            <Scrollbar ref="scroller" class="scroller">
+                </Alert>
                 <div class="title">
                     <Input
                         v-model="taskDetail.name"
diff --git a/resources/assets/sass/components/user-select.scss b/resources/assets/sass/components/user-select.scss
index 71cbe57f0..b304d6209 100755
--- a/resources/assets/sass/components/user-select.scss
+++ b/resources/assets/sass/components/user-select.scss
@@ -49,6 +49,16 @@
             position: relative;
             font-weight: 500;
 
+            .user-modal-close,
+            .user-modal-title,
+            .user-modal-submit {
+                height: 100%;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                line-height: normal;
+            }
+
             .user-modal-close {
                 padding: 0 24px;
                 color: $primary-text-color;
@@ -60,10 +70,8 @@
                 bottom: 0;
                 left: 100px;
                 right: 100px;
-                display: flex;
-                justify-content: center;
-                align-items: center;
                 > span {
+                    text-align: center;
                     font-size: 16px;
                     color: $primary-title-color;
                     overflow: hidden;
@@ -75,8 +83,6 @@
             .user-modal-submit {
                 padding: 0 24px;
                 color: $primary-color;
-                display: flex;
-                align-items: center;
 
                 .submit-loading {
                     width: 14px;
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index 42013f9ae..17c2aa4b0 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -2099,6 +2099,8 @@ body:not(.window-touch) {
             gap: 20px;
 
             .dialog-wrapper-forward-footer {
+                flex: 1;
+                width: 0;
                 display: flex;
                 line-height: 34px;
                 cursor: pointer;
@@ -2111,6 +2113,12 @@ body:not(.window-touch) {
                     margin-top: 6px;
                 }
 
+                .forward-text-tip {
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                }
+
                 &.selected {
                     .user-modal-icon {
                         color: $primary-color;
diff --git a/resources/assets/sass/pages/components/task-detail.scss b/resources/assets/sass/pages/components/task-detail.scss
index bce8b1a3d..050d13831 100644
--- a/resources/assets/sass/pages/components/task-detail.scss
+++ b/resources/assets/sass/pages/components/task-detail.scss
@@ -149,12 +149,36 @@
                     }
                 }
             }
+            @media (max-width: 320px) {
+                .nav {
+                    margin-right: 20px;
+                }
+                .function {
+                    display: none;
+                }
+            }
         }
         .scroller {
             margin-right: -5px;
             .scrollbar-content {
                 padding: 0 5px;
             }
+            .receive-box {
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                margin-top: 18px;
+                padding: 8px 16px;
+                line-height: 18px;
+                .receive-text {
+                    padding-right: 8px;
+                    vertical-align: middle;
+                }
+                .receive-button {
+                    display: inline-block;
+                    margin: 4px 0;
+                }
+            }
             .title {
                 margin-top: 18px;
                 .ivu-input {