Commit cc2beae6 authored by gxx's avatar gxx

团队页面修改

parent 1db4632b
...@@ -172,7 +172,6 @@ class GroupController extends Controller ...@@ -172,7 +172,6 @@ class GroupController extends Controller
public function simpleSearchUser($search) public function simpleSearchUser($search)
{ {
$user = $this->mGroup->getUser($search); $user = $this->mGroup->getUser($search);
if ($user){ if ($user){
return $user; return $user;
}else{ }else{
...@@ -194,11 +193,8 @@ class GroupController extends Controller ...@@ -194,11 +193,8 @@ class GroupController extends Controller
$group_id = $request->group_id; $group_id = $request->group_id;
$inviteResult = $this->mGroup->invite($group_id,$user_id); $inviteResult = $this->mGroup->invite($group_id,$user_id);
if($inviteResult){ if($inviteResult){
return Message::makeSuccess('邀请成功!'); return Message::makeSuccess('邀请成功!');
}else{ }else{
return Message::makeError('你邀请过了吧!'); return Message::makeError('你邀请过了吧!');
} }
......
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
<li class="active"><a href="#activity" data-toggle="tab">团队成员</a></li> <li class="active"><a href="#activity" data-toggle="tab">团队成员</a></li>
<li><a href="#timeline" data-toggle="tab">Timeline</a></li> <li><a href="#timeline" data-toggle="tab">Timeline</a></li>
<li><a href="#settings" data-toggle="tab">Settings</a></li> <li><a href="#settings" data-toggle="tab">Settings</a></li>
<li><a href="{{route('group.invitePage',['group_id' => $groups->id])}}" > 邀请新成员</a></li>
</ul> </ul>
<div class="tab-content" style="height: 740px"> <div class="tab-content" style="height: 740px">
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
<input type="hidden" name="id" value=""> <input type="hidden" name="id" value="">
</div> </div>
<p style="color: green; display: none" id="pp1" >*用户存在可以邀请加入</p> <p style="color: green; display: none" id="pp1" >*用户存在可以邀请加入</p>
<input type="text" id="user_id" value="" name="user_id"> <input type="hidden" id="user_id" value="" name="user_id">
<input type="text" name="group_id" value="{{$group_id}}"> <input type="hidden" name="group_id" value="{{$group_id}}">
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment