diff --git a/admin/src/app/views/campus_person_role/campus_person_role.vue b/admin/src/app/views/campus_person_role/campus_person_role.vue index 6a0cc47d..732e9e1b 100644 --- a/admin/src/app/views/campus_person_role/campus_person_role.vue +++ b/admin/src/app/views/campus_person_role/campus_person_role.vue @@ -198,7 +198,6 @@ import Edit from '@/app/views/campus_person_role/components/campus-person-role-e import { useRoute } from 'vue-router' const route = useRoute() const pageName = route.meta.title -// ?dept_id=1 let campusPersonRoleTable = reactive({ page: 1, @@ -218,10 +217,9 @@ let campusPersonRoleTable = reactive({ if(pageName == '市场人员列表'){ campusPersonRoleTable.searchParam.dept_id = 1; }else if(pageName == '销售人员列表'){ - campusPersonRoleTable.searchParam.dept_id = 2; - // campusPersonRoleTable.searchParam.role_id = 2; + campusPersonRoleTable.searchParam.dept_id = 3; }else if(pageName == '教练管理'){ - campusPersonRoleTable.searchParam.role_id = 5; + campusPersonRoleTable.searchParam.role_id = 2; } const searchFormRef = ref() diff --git a/admin/src/app/views/campus_person_role/components/campus-person-role-edit.vue b/admin/src/app/views/campus_person_role/components/campus-person-role-edit.vue index b9532959..c856899e 100644 --- a/admin/src/app/views/campus_person_role/components/campus-person-role-edit.vue +++ b/admin/src/app/views/campus_person_role/components/campus-person-role-edit.vue @@ -160,10 +160,10 @@ const initialFormData = { if(pageName == '市场人员列表'){ initialFormData.dept_id = 1; }else if(pageName == '销售人员列表'){ - initialFormData.dept_id = 2; + initialFormData.dept_id = 3; // campusPersonRoleTable.searchParam.role_id = 2; }else if(pageName == '教练管理'){ - initialFormData.dept_id = 3; + initialFormData.dept_id = 2; }else{ initialFormData.dept_id = 0; } diff --git a/niucloud/app/service/api/login/LoginService.php b/niucloud/app/service/api/login/LoginService.php index b1537d94..59c5a239 100644 --- a/niucloud/app/service/api/login/LoginService.php +++ b/niucloud/app/service/api/login/LoginService.php @@ -375,6 +375,7 @@ class LoginService extends BaseApiService //获取用户部门ids(1市场、2教师、3销售) $depts = (new CampusPersonRole())->where('person_id', $member_info->id)->column('dept_id'); $user_type = in_array($params['login_type'],$depts) ? $params['login_type'] : ''; + return [ 'token' => $token_info['token'],//token 'expires_time' => $token_info['params']['exp'],//过期时间