From abc7edc3c8ad59ff213c85413d0d6a10d7a0b6f7 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Wed, 17 Dec 2025 18:03:09 +0800
Subject: [PATCH] 1.	发布供需消耗连盟币,连盟币数量在后台独立设置 2.	小程序供需个人中心可自由切换身份 3.	增加私信系统 4.	增加评论系统,用户可在发布者详情页进行评论操作,评论获得的连盟币可在后台设置 5.	增加发布者的等级,以好评个数为条件进行升级,小程序端会显示该等级的图标,如没有等级则不会显示图标 6.	增加设置消耗连盟币可以解锁、查看发布的信息,费用可在后台设置 7.	小程序供需大厅界面优化,以及增加了推荐栏目,该栏目按发布的分类相似进行匹配,比如A用户发布了 互联网 分类的需求,则会优先推荐匹配互联网分类的供应需求给他。

---
 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