From 9f2b6dada7304026de555b3e751b17a5a65e6d7a Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Wed, 26 Nov 2025 14:36:05 +0800
Subject: [PATCH] 1、修复会长小程序端编辑获取信息报错和选择了活动时间但还是提示请选择活动时间 2、修复小程序添加分会成员选择会员时无法下拉问题
---
admin/app/api/controller/branch/admin/Member.php | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/admin/app/api/controller/branch/admin/Member.php b/admin/app/api/controller/branch/admin/Member.php
index db91a41..36f4efa 100644
--- a/admin/app/api/controller/branch/admin/Member.php
+++ b/admin/app/api/controller/branch/admin/Member.php
@@ -6,6 +6,8 @@
use app\api\service\branch\MemberService;
use app\api\model\branch\ActivityUser as ActivityUserModel;
use app\api\model\branch\Member as MemberModel;
+use app\branch\model\position\Position as PositionModel;
+use app\common\model\settings\Region as RegionModel;
/**
* 会员数据控制器
@@ -47,4 +49,54 @@
$list = $model->getUserRankList($date, $this->branch['branch_id']);
return $this->renderSuccess('', compact('list'));
}
+
+ /**
+ * 新增股东
+ */
+ public function add()
+ {
+ if ($this->request->isGet()) {
+ $positionList = PositionModel::getAll();
+ $regionData = RegionModel::getRegionForApi();
+ return $this->renderSuccess('', compact('positionList', 'regionData'));
+ }
+ $model = new MemberModel;
+ // 新增记录
+ $data = json_decode($this->request->post('formData', '', null), true);
+ $data['branch_id'] = $this->branch['branch_id'];
+ if ($model->add($data)) {
+ return $this->renderSuccess('添加成功');
+ }
+ return $this->renderError($model->getError() ?: '添加失败');
+ }
+
+ /**
+ * 编辑成员
+ */
+ public function edit($user_id)
+ {
+ $model = MemberModel::detail($user_id, ['user', 'supplier', 'position']);
+ if ($this->request->isGet()) {
+ $positionList = PositionModel::getAll();
+ $regionData = RegionModel::getRegionForApi();
+ return $this->renderSuccess('', compact('positionList', 'regionData', 'model'));
+ }
+ $data = json_decode($this->request->post('formData', '', null), true);
+ if ($model->edit($data)) {
+ return $this->renderSuccess('更新成功');
+ }
+ return $this->renderError($model->getError() ?: '更新失败');
+ }
+
+ /**
+ * 软删除成员
+ */
+ public function delete($user_id)
+ {
+ $model = MemberModel::detail($user_id);
+ if (!$model->setDelete()) {
+ return $this->renderError('删除失败');
+ }
+ return $this->renderSuccess('删除成功');
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2