From df60073f4fb06ea2d16984635e0714bae8a1f8e9 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 22 Dec 2025 18:03:35 +0800
Subject: [PATCH] 1.在总后台首页装修增加了活动专区和智能匹配 模块 2.目前活动专区获取的是发布需求最新的数据，智能匹配是用户没登录前也是获取发布需求最新数据，登录后会根据用户发布的需求，通过分类匹配到对应的数据 3.修复缴纳保证金报错 4.修复发布需求报错
---
admin/app/branch/controller/member/Member.php | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/admin/app/branch/controller/member/Member.php b/admin/app/branch/controller/member/Member.php
index 30ef059..97f617a 100644
--- a/admin/app/branch/controller/member/Member.php
+++ b/admin/app/branch/controller/member/Member.php
@@ -6,6 +6,7 @@
use app\branch\model\member\Member as MemberModel;
use app\branch\model\position\Position as PositionModel;
use app\branch\model\activityUser\ActivityUser as ActivityUserModel;
+use app\common\model\settings\Region as RegionModel;
/**
* 分销控制器
@@ -19,6 +20,8 @@
{
$model = new MemberModel;
$postData = $this->postData();
+ $branch = $this->branch['user'];
+ $postData['branch_id'] = $branch['branch_id'];
$list = $model->getList($postData);
return $this->renderSuccess('', compact('list'));
@@ -30,19 +33,19 @@
public function add()
{
if ($this->request->isGet()) {
- $positionList = PositionModel::getList();
- return $this->renderSuccess('', compact('positionList'));
+ $positionList = PositionModel::getAll();
+ $areaList = RegionModel::getCacheTree();
+ return $this->renderSuccess('', compact('positionList', 'areaList'));
}
- $user_id = $this->postData('user_id');
- if (MemberModel::detail($user_id)) {
- return $this->renderError('该用户已经是连盟成员，不能重复添加');
- }
$model = new MemberModel;
+ $postData = $this->postData();
+ $branch = $this->branch['user'];
+ $postData['branch_id'] = $branch['branch_id'];
// 新增记录
- if ($model->add($this->postData())) {
+ if ($model->add($postData)) {
return $this->renderSuccess('添加成功');
}
- return $this->renderError('添加失败');
+ return $this->renderError($model->getError() ?: '添加失败');
}
/**
@@ -51,8 +54,9 @@
public function edit()
{
if ($this->request->isGet()) {
- $positionList = PositionModel::getList();
- return $this->renderSuccess('', compact('positionList'));
+ $positionList = PositionModel::getAll();
+ $areaList = RegionModel::getCacheTree();
+ return $this->renderSuccess('', compact('positionList', 'areaList'));
}
$user_id = $this->postData('user_id');
$model = MemberModel::detail($user_id);
--
Gitblit v1.9.2