From 69110c094343fa111eee75b0a56fef7dd7995f8a Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Tue, 25 Nov 2025 18:09:45 +0800
Subject: [PATCH] 修复优惠券点击立即使用弹出二维码问题 商家后台添加分销和超级分红 添加活动分享功能 添加商户提现功能
---
admin/app/branch/controller/member/Member.php | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/admin/app/branch/controller/member/Member.php b/admin/app/branch/controller/member/Member.php
index 30ef059..eb7c27b 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;
/**
* 分销控制器
@@ -30,19 +31,16 @@
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;
// 新增记录
if ($model->add($this->postData())) {
return $this->renderSuccess('添加成功');
}
- return $this->renderError('添加失败');
+ return $this->renderError($model->getError() ?: '添加失败');
}
/**
@@ -51,8 +49,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