...
|
...
|
@@ -9,6 +9,7 @@ |
|
|
namespace api\index\controller;
|
|
|
|
|
|
|
|
|
use api\common\model\ActivityModel;
|
|
|
use api\common\model\ActivityNews;
|
|
|
use api\common\model\AddressModel;
|
|
|
use api\common\model\ClassModel;
|
...
|
...
|
@@ -22,6 +23,7 @@ use api\common\model\TeamModel; |
|
|
use api\common\model\UserPassModel;
|
|
|
use api\common\model\UserWorkLog;
|
|
|
use api\common\model\VolunteerModel;
|
|
|
use api\index\model\JoinModel;
|
|
|
use api\index\model\ManageModel;
|
|
|
use api\index\model\UserModel;
|
|
|
use cmf\controller\RestBaseController;
|
...
|
...
|
@@ -880,7 +882,7 @@ class SecondController extends RestBaseController |
|
|
*
|
|
|
*
|
|
|
*@header name:XX-Token require:1 default: desc:token
|
|
|
*
|
|
|
*@param name:good_id type:int require:1 other: desc:商品id
|
|
|
*
|
|
|
* @throws
|
|
|
*/
|
...
|
...
|
@@ -897,12 +899,20 @@ class SecondController extends RestBaseController |
|
|
*
|
|
|
*
|
|
|
*@header name:XX-Token require:1 default: desc:token
|
|
|
*
|
|
|
*@param name:user_id type:int require:1 other: desc:用户id
|
|
|
*
|
|
|
* @throws
|
|
|
*/
|
|
|
public function otherHome(){
|
|
|
|
|
|
$user_id=input('user_id');
|
|
|
$volunteer=new VolunteerModel();
|
|
|
$Join=new JoinModel();
|
|
|
$return['userInfo']=$volunteer->getUserInfo($user_id);
|
|
|
$Activity=new ActivityModel();
|
|
|
$return['userJoin']=$Join->getUserJoin($user_id);
|
|
|
$Team=new TeamModel();
|
|
|
$return['team']=$Team->joinTeamList($user_id);
|
|
|
$this->success('',$return);
|
|
|
}
|
|
|
|
|
|
|
...
|
...
|
|