From 0388fafc0f512c90f68e3bf3c074a8bf04bd1abc Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Wed, 29 Apr 2026 10:46:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BC=9A=E5=91=98=E6=9D=83?=
 =?UTF-8?q?=E7=9B=8A=E9=A1=B9=E7=9B=AE=E6=B7=BB=E5=8A=A0=E5=85=A5=E4=BC=9A?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/wdsxh/member/RightsProject.php | 41 +++++++++++++++++--
 .../zh-cn/wdsxh/member/rights_project.php     |  1 +
 .../wdsxh/member/MemberBenefitsProject.php    |  5 +++
 .../js/backend/wdsxh/member/rights_project.js |  5 +++
 4 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/application/admin/controller/wdsxh/member/RightsProject.php b/application/admin/controller/wdsxh/member/RightsProject.php
index 8ae39dd..0ef05b9 100644
--- a/application/admin/controller/wdsxh/member/RightsProject.php
+++ b/application/admin/controller/wdsxh/member/RightsProject.php
@@ -26,10 +26,43 @@ class RightsProject extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\wdsxh\member\MemberBenefitsProject();
-        $this->view->assign("statusList", $this->model->getDisabledList());
-
-        $this->join_config_model = new \app\admin\model\wdsxh\member\JoinConfig();
-        $this->view->assign('join_config', $this->join_config_model->getSimpleByStatus());
         $this->searchFields = ['title'];
     }
+
+    protected $beforeActionList = [
+        'statusList' => ['only'=>'index'],
+        'joinConfig' => ['only'=>'add,edit'],
+    ];
+
+    protected function statusList()
+    {
+        $this->view->assign("statusList", $this->model->getDisabledList());
+    }
+
+    protected function joinConfig()
+    {
+        $this->join_config_model = new \app\admin\model\wdsxh\member\JoinConfig();
+        $this->view->assign('join_config', $this->join_config_model->getSimpleByStatus());
+    }
+
+    public function index()
+    {
+        $this->request->filter(['strip_tags', 'trim']);
+        if (false === $this->request->isAjax()) {
+            return $this->view->fetch();
+        }
+        //如果发送的来源是 Selectpage，则转发到 Selectpage
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
+
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $list = $this->model
+            ->with(['joinConfig'])
+            ->where($where)
+            ->order($sort, $order)
+            ->paginate($limit);
+        $result = ['total' => $list->total(), 'rows' => $list->items()];
+        return json($result);
+    }
 }
diff --git a/application/admin/lang/zh-cn/wdsxh/member/rights_project.php b/application/admin/lang/zh-cn/wdsxh/member/rights_project.php
index 9aa7dae..00029cc 100644
--- a/application/admin/lang/zh-cn/wdsxh/member/rights_project.php
+++ b/application/admin/lang/zh-cn/wdsxh/member/rights_project.php
@@ -1,6 +1,7 @@
 <?php
 
 return [
+    'Member Benefits Project Join Config Name' => '入会类型',
     'Member Benefits Project Name' => '权益项目',
     'Member Benefits Project Sort'   => '排序',
     'Member Benefits Project Status' => '状态',
diff --git a/application/admin/model/wdsxh/member/MemberBenefitsProject.php b/application/admin/model/wdsxh/member/MemberBenefitsProject.php
index e344429..c41e7e6 100644
--- a/application/admin/model/wdsxh/member/MemberBenefitsProject.php
+++ b/application/admin/model/wdsxh/member/MemberBenefitsProject.php
@@ -32,6 +32,11 @@ class MemberBenefitsProject extends Model
         'disabled_text'
     ];
 
+    public function joinConfig()
+    {
+        return $this->hasOne(JoinConfig::class, 'id', 'join_config_id')->bind(['join_config_name' => 'name']);
+    }
+
 
     protected static function init()
     {
diff --git a/public/assets/js/backend/wdsxh/member/rights_project.js b/public/assets/js/backend/wdsxh/member/rights_project.js
index e998e3c..555522c 100755
--- a/public/assets/js/backend/wdsxh/member/rights_project.js
+++ b/public/assets/js/backend/wdsxh/member/rights_project.js
@@ -29,6 +29,11 @@ define(["jquery", "bootstrap", "backend", "table", "form"], function (
                     [
                         { checkbox: true },
                         { field: "id", title: __("Id") },
+                        {
+                            field: "join_config_name",
+                            title: __("Member Benefits Project Join Config Name"),
+                            operate: false,
+                        },
                         {
                             field: "name",
                             title: __("Member Benefits Project Name"),