github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 11:07:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '2b5b522f3ec7c0bb8c2c82fbe754b194df550305' into pro

Browse Source 
# Conflicts:
#	public/site/zh/index.html
This commit is contained in:
kuaifan 2023-07-27 11:54:04 +08:00
commit e6be45516d
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/WebSocketDialog.php
View File

@ -555,7 +555,7 @@ class WebSocketDialog extends AbstractModel
return $dialogUser; return $dialogUser;
} }
if ($receiver > 0 && $user->isTemp()) { if ($receiver > 0 && $user->isTemp()) {
throw new ApiException('无法发起会话'); throw new ApiException('无法发起会话，请联系管理员。');
} }
return AbstractModel::transaction(function () use ($receiver, $user) { return AbstractModel::transaction(function () use ($receiver, $user) {
$dialog = self::createInstance([ $dialog = self::createInstance([

2
language/original-api.txt
View File

@ -391,7 +391,7 @@ error
个人项目 个人项目
注册时系统自动创建项目，你可以自由删除。 注册时系统自动创建项目，你可以自由删除。
无法发起会话 无法发起会话，请联系管理员。
无法创建群组 无法创建群组
无法查看联系电话 无法查看联系电话

9
resources/assets/sass/pages/page-approve.scss vendored
View File

@ -243,9 +243,18 @@
.approve-record-comment { .approve-record-comment {
padding: 10px; padding: 10px;
padding-bottom: 0; padding-bottom: 0;
.ivu-list-item>div:first-child{
width: 100%;
}
.top { .top {
display: flex; display: flex;
gap: 8px; gap: 8px;
width: 100%;
>div{
flex:1;
}
} }
.time { .time {

2
resources/mobile

@ -1 +1 @@
Subproject commit beef15a591134255727755e635e72a7af9a0df0c Subproject commit d47541cff5f8b3df62b0176802451b8858e5a7ce