优化名片

quanwei

3 days ago 73b874c72ad55eb9eef21c36160ac0de58f0189e

 admin/app/api/controller/branch/Activity.php

@@ -55,7 +55,7 @@
        // 用户是否已报名
        $detail['is_reg'] = ActivityUserModel::isReg($user['user_id'], $activity_id);
        // 用户是否已加入分会
        $detail['is_member'] = MemberModel::isMember($user['user_id']);
        $detail['is_member'] =/*MemberModel::isMember($user['user_id'])*/false;
        // 用户是否已签到
        $detail['is_verify'] = ActivityUserModel::isVerify($user['user_id'], $activity_id);
        $store = SettingModel::getItem('store');
@@ -63,7 +63,7 @@
        $points = SettingModel::getItem('points');
        $detail['points_ratio'] = $points['discount']['discount_ratio']; // 积分抵扣比例
        // 获取报名用户列表
        $userList = (new ActivityUserModel())->getListForActivity(['activity_id' => $activity_id], false, 8);
        $userList = (new ActivityUserModel())->getListForActivity(['activity_id' => $activity_id], false, 7);
        return $this->renderSuccess('', compact('detail', 'userList'));
    }

@@ -97,12 +97,13 @@
            return $this->renderSuccess('', compact('order_id'));
        }
    }
    public function getRegistrationInformation($user_id = 0)
    public function getRegistrationInformation($user_id = 0,$activity_id=0)
    {
        // 生成报名用户
        $model = new ActivityUserModel();
        $userId = $user_id!=0?$user_id:$this->getUser()['user_id'];
        $registrationInformation = $model->getRegistrationInformation($userId);
        $user=$this->getUser();
        $userId = $user_id!=0?$user_id:$user['user_id'];
        $registrationInformation = $model->getRegistrationInformation($userId,$activity_id);
        return $this->renderSuccess('', compact('registrationInformation'));
    }
    /**