no message

app/Tasks/WebSocketDialogMsgTask.php

@@ -52,14 +52,18 @@ class WebSocketDialogMsgTask extends AbstractTask
         $array = [];
         $userids = $dialog->dialogUser->pluck('userid')->toArray();
         foreach ($userids AS $userid) {
-            $mention = preg_match("/<span class=\"mention user\" data-id=\"[0|{$userid}]\">/", $msg->type === 'text' ? $msg->msg['text'] : '');
+            if ($userid == $msg->userid) {
-            WebSocketDialogMsgRead::createInstance([
+                $array[$userid] = false;
-                'dialog_id' => $msg->dialog_id,
+            } else {
-                'msg_id' => $msg->id,
+                $mention = preg_match("/<span class=\"mention user\" data-id=\"[0|{$userid}]\">/", $msg->type === 'text' ? $msg->msg['text'] : '');
-                'userid' => $userid,
+                WebSocketDialogMsgRead::createInstance([
-                'mention' => $mention,
+                    'dialog_id' => $msg->dialog_id,
-            ])->saveOrIgnore();
+                    'msg_id' => $msg->id,
-            $array[$userid] = $mention;
+                    'userid' => $userid,
+                    'mention' => $mention,
+                ])->saveOrIgnore();
+                $array[$userid] = $mention;
+            }
         }
         // 更新已发送数量
         $msg->send = WebSocketDialogMsgRead::whereMsgId($msg->id)->count();

public/js/build/117.js.LICENSE.txt

@@ -8,7 +8,7 @@
 /*!
  * The buffer module from node.js, for the browser.
  *
- * @author   Feross Aboukhadijeh <http://feross.org>
+ * @author   Feross Aboukhadijeh <https://feross.org>
  * @license  MIT
  */
 

public/js/build/281.js.LICENSE.txt

@@ -8,7 +8,7 @@
 /*!
  * The buffer module from node.js, for the browser.
  *
- * @author   Feross Aboukhadijeh <http://feross.org>
+ * @author   Feross Aboukhadijeh <https://feross.org>
  * @license  MIT
  */
 

public/js/build/446.js.LICENSE.txt

@@ -8,7 +8,7 @@
 /*!
  * The buffer module from node.js, for the browser.
  *
- * @author   Feross Aboukhadijeh <http://feross.org>
+ * @author   Feross Aboukhadijeh <https://feross.org>
  * @license  MIT
  */
 

public/js/build/626.js.LICENSE.txt

@@ -8,7 +8,7 @@
 /*!
  * The buffer module from node.js, for the browser.
  *
- * @author   Feross Aboukhadijeh <http://feross.org>
+ * @author   Feross Aboukhadijeh <https://feross.org>
  * @license  MIT
  */
 

public/js/hash

@@ -1 +1 @@
-81ee2b454b557f3d
+2bae144443d0bd72

resources/assets/js/pages/manage/setting/components/SystemEmailSetting.vue

@@ -40,19 +40,19 @@
                         <FormItem :label="$L('任务开始')" prop="task_start_minute">
                             <div class="input-number-box">
                                 <InputNumber v-model="formData.task_start_minute" :min="0" :step="1"/>
-                                <label>{{ $L('分钟') }}</label>
+                                <label>{{ $L('分钟') }}(m)</label>
                             </div>
                         </FormItem>
                         <FormItem :label="$L('距离到期')" prop="task_remind_hours">
                             <div class="input-number-box">
                                 <InputNumber v-model="formData.task_remind_hours" :min="0" :step="0.5" @on-change="hoursChange($event, 'task_remind_hours')"/>
-                                <label>{{ $L('小时') }}</label>
+                                <label>{{ $L('小时') }}(h)</label>
                             </div>
                         </FormItem>
                         <FormItem :label="$L('到期超时')" prop="task_remind_hours2">
                             <div class="input-number-box">
                                 <InputNumber v-model="formData.task_remind_hours2" :min="0" :step="0.5" @on-change="hoursChange($event, 'task_remind_hours2')"/>
-                                <label>{{ $L('小时') }}</label>
+                                <label>{{ $L('小时') }}(h)</label>
                             </div>
                         </FormItem>
                         <div class="form-tip">{{$L('填写-1则不通知，误差±10分钟')}}</div>
@@ -67,13 +67,13 @@
                         <FormItem :label="$L('未读个人消息')" prop="msg_unread_user_minute">
                             <div class="input-number-box">
                                 <InputNumber v-model="formData.msg_unread_user_minute" :min="0" :step="1"/>
-                                <label>{{ $L('分钟') }}</label>
+                                <label>{{ $L('分钟') }}(m)</label>
                             </div>
                         </FormItem>
                         <FormItem :label="$L('未读群聊消息')" prop="msg_unread_group_minute">
                             <div class="input-number-box">
                                 <InputNumber v-model="formData.msg_unread_group_minute" :min="0" :step="1"/>
-                                <label>{{ $L('分钟') }}</label>
+                                <label>{{ $L('分钟') }}(m)</label>
                             </div>
                         </FormItem>
                         <div class="form-tip">{{$L('填写-1则不通知，误差±10分钟')}}</div>

resources/assets/sass/pages/common.scss

@@ -27,6 +27,7 @@ body {
             background-color: #f8f8f9;
             padding: 0 7px;
             font-weight: 400;
+            white-space: nowrap;
             &:first-child {
                 border-left: 1px solid transparent;
                 border-right: 1px solid #dcdee2;