From 73b874c72ad55eb9eef21c36160ac0de58f0189e Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Thu, 05 Feb 2026 10:30:43 +0800
Subject: [PATCH] δΌ˜εŒ–εη‰‡

---
 admin/app/api/controller/branch/Member.php |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/admin/app/api/controller/branch/Member.php b/admin/app/api/controller/branch/Member.php
index 14b01e4..2a02706 100644
--- a/admin/app/api/controller/branch/Member.php
+++ b/admin/app/api/controller/branch/Member.php
@@ -4,6 +4,7 @@
 
 use app\api\controller\Controller;
 use app\api\model\branch\Member as MemberModel;
+use app\common\model\branch\Setting as SettingModel;
 use xin\helper\Func;
 
 /**
@@ -18,7 +19,9 @@
     {
         $model = new MemberModel;
         $list = $model->getList($this->postData());
-        return $this->renderSuccess('', compact('list'));
+        $words = SettingModel::getItem('words');
+        $setting = SettingModel::getItem('basic');
+        return $this->renderSuccess('', compact('list', 'words', 'setting'));
     }
 
     /**
@@ -27,7 +30,8 @@
     public function detail($user_id)
     {
         $detail = MemberModel::detail($user_id, ['user', 'supplier.category', 'branch']);
-        return $this->renderSuccess('', compact('detail'));
+        $setting = SettingModel::getItem('basic');
+        return $this->renderSuccess('', compact('detail', 'setting'));
     }
     
 }
\ No newline at end of file

--
Gitblit v1.9.2