admin/app/api/model/branch/ActivityUser.php
@@ -39,7 +39,7 @@
    public function getListForUser($user_id, $params = [])
    {
        // 构建查询规则
        $model = $this->alias('A')->with(['activity' => ['branch', 'image']])
        $model = $this->alias('A')->with(['activity' => ['branch', 'image'],'branch'])
            ->join('branch_activity B', 'B.activity_id = A.activity_id')
            ->field('A.*')
            ->visible(['activity' => ['name', 'image' => ['file_path'], 'branch' => ['name']]])
@@ -65,6 +65,7 @@
    {
        // 构建查询规则
        $model = $this->alias('auser')
            ->with('branch')
            ->field('auser.*,user.nickName,auser.real_name,user.avatarUrl')
            ->join('user', 'user.user_id = auser.user_id')
            ->where('auser.is_delete', '=', 0)
@@ -154,7 +155,19 @@
    {
        $list=$this->where('user_id', '=', $user_id)
            ->order('create_time', 'desc')->find();
        $data=[];
        $data=[
            'province_id'=>'',
            'city_id'=>'',
            'region_id'=>'',
            'recommend_name'=>'',
            'recommend_mobile'=>'',
            'real_name'=>'',
            'mobile'=>'',
            'branch_id'=>'',
            'company'=>'',
            'branch_name'=>'',
            'region'=>'',
        ];
        if ($list){
            $branch=(new Branch())->detail($list['branch_id']);
            $data=[