github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-17 03:03:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

前端文案“会员”改成“成员”

Browse Source
This commit is contained in:
kuaifan 2022-07-15 18:46:18 +08:00
parent 0a99ecdd9b
commit 3fe6ab0e79
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Api/ProjectController.php
View File

@ -498,7 +498,7 @@ class ProjectController extends AbstractController
$project = Project::userProject($project_id, true, true); $project = Project::userProject($project_id, true, true);
// //
if (!User::whereUserid($owner_userid)->exists()) { if (!User::whereUserid($owner_userid)->exists()) {
return Base::retError('会员不存在'); return Base::retError('成员不存在');
} }
// //
AbstractModel::transaction(function() use ($owner_userid, $project) { AbstractModel::transaction(function() use ($owner_userid, $project) {
@ -978,7 +978,7 @@ class ProjectController extends AbstractController
return Base::retError('参数错误'); return Base::retError('参数错误');
} }
if (count($userid) > 20) { if (count($userid) > 20) {
return Base::retError('导出会员限制最多20个'); return Base::retError('导出成员限制最多20个');
} }
if (!(is_array($time) && Base::isDateOrTime($time[0]) && Base::isDateOrTime($time[1]))) { if (!(is_array($time) && Base::isDateOrTime($time[0]) && Base::isDateOrTime($time[1]))) {
return Base::retError('时间选择错误'); return Base::retError('时间选择错误');

2
app/Http/Controllers/Api/UsersController.php
View File

@ -599,7 +599,7 @@ class UsersController extends AbstractController
// //
$userInfo = User::find($userid); $userInfo = User::find($userid);
if (empty($userInfo)) { if (empty($userInfo)) {
return Base::retError('会员不存在或已被删除'); return Base::retError('成员不存在或已被删除');
} }
$userInfo->checkSystem(1); $userInfo->checkSystem(1);
// //

2
app/Services/WebSocketService.php
View File

@ -69,7 +69,7 @@ class WebSocketService implements WebSocketHandlerInterface
$server->push($fd, Base::array2json([ $server->push($fd, Base::array2json([
'type' => 'error', 'type' => 'error',
'data' => [ 'data' => [
'error' => '会员不存在' 'error' => '成员不存在'
], ],
])); ]));
$server->close($fd); $server->close($fd);

4
docker/php/php.conf
View File

@ -2,10 +2,10 @@
directory=/var/www directory=/var/www
# 生产环境 # 生产环境
command=php bin/laravels start -i #command=php bin/laravels start -i
# 开发环境 # 开发环境
#command=./bin/inotify ./app command=./bin/inotify ./app
numprocs=1 numprocs=1
autostart=true autostart=true

4
resources/assets/js/pages/manage.vue
View File

@ -283,8 +283,8 @@
:title="$L('导出任务统计')" :title="$L('导出任务统计')"
:mask-closable="false"> :mask-closable="false">
<Form ref="exportTask" :model="exportData" label-width="auto" @submit.native.prevent> <Form ref="exportTask" :model="exportData" label-width="auto" @submit.native.prevent>
<FormItem :label="$L('导出会员')"> <FormItem :label="$L('导出成员')">
<UserInput v-model="exportData.userid" :multiple-max="20" :placeholder="$L('请选择会员')"/> <UserInput v-model="exportData.userid" :multiple-max="20" :placeholder="$L('请选择成员')"/>
</FormItem> </FormItem>
<FormItem :label="$L('时间范围')"> <FormItem :label="$L('时间范围')">
<DatePicker <DatePicker

2
resources/assets/js/pages/manage/components/ChatInput/index.vue
View File

@ -38,7 +38,7 @@
<!-- @ # --> <!-- @ # -->
<li> <li>
<ETooltip placement="top" :disabled="windowSmall" :content="$L('选择会员')"> <ETooltip placement="top" :disabled="windowSmall" :content="$L('选择成员')">
<i class="taskfont" @click="onToolbar('user')">&#xe78f;</i> <i class="taskfont" @click="onToolbar('user')">&#xe78f;</i>
</ETooltip> </ETooltip>
</li> </li>

2
resources/assets/js/pages/manage/components/ProjectArchived.vue
View File

@ -118,7 +118,7 @@ export default {
width: 168, width: 168,
}, },
{ {
title: this.$L('归档会员'), title: this.$L('归档人员'),
key: 'archived_userid', key: 'archived_userid',
minWidth: 80, minWidth: 80,
render: (h, {row}) => { render: (h, {row}) => {

2
resources/assets/js/pages/manage/components/TaskArchived.vue
View File

@ -151,7 +151,7 @@ export default {
width: 168, width: 168,
}, },
{ {
title: this.$L('归档会员'), title: this.$L('归档人员'),
key: 'archived_userid', key: 'archived_userid',
minWidth: 100, minWidth: 100,
render: (h, {row}) => { render: (h, {row}) => {