From 742254c55d0c880d52a091f8be3ab3e9c6f636a4 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Tue, 28 Apr 2026 18:01:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=9D=83=E7=9B=8A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/wdsxh/member/Level.php   |  4 +++
 .../zh-cn/wdsxh/member/rights_project.php     | 10 ++++++++
 .../admin/view/wdsxh/member/level/index.html  |  9 +------
 .../view/wdsxh/member/rights_project/add.html | 17 ++++++++-----
 .../wdsxh/member/rights_project/edit.html     | 17 ++++++++-----
 .../js/backend/wdsxh/member/rights_project.js | 25 ++++++-------------
 runtime/.gitkeep                              |  1 -
 7 files changed, 44 insertions(+), 39 deletions(-)
 create mode 100644 application/admin/lang/zh-cn/wdsxh/member/rights_project.php
 delete mode 100644 runtime/.gitkeep

diff --git a/application/admin/controller/wdsxh/member/Level.php b/application/admin/controller/wdsxh/member/Level.php
index 14b22b2..8380bc4 100644
--- a/application/admin/controller/wdsxh/member/Level.php
+++ b/application/admin/controller/wdsxh/member/Level.php
@@ -206,6 +206,10 @@ class Level extends Backend
             $join_config = $this->join_config_model->getSimpleByStatus();
             $this->view->assign('join_config', $join_config);
 
+            if (empty($row['benefits_project'])) {
+                $row['benefits_project'] = [];
+            }
+
             $this->view->assign('row', $row);
             return $this->view->fetch();
         }
diff --git a/application/admin/lang/zh-cn/wdsxh/member/rights_project.php b/application/admin/lang/zh-cn/wdsxh/member/rights_project.php
new file mode 100644
index 0000000..9aa7dae
--- /dev/null
+++ b/application/admin/lang/zh-cn/wdsxh/member/rights_project.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'Member Benefits Project Name' => '权益项目',
+    'Member Benefits Project Sort'   => '排序',
+    'Member Benefits Project Status' => '状态',
+    'Member Benefits Project Enabled'  => '显示',
+    'Member Benefits Project Disabled' => '隐藏',
+    'Member Benefits Project Operate' => '操作',
+];
diff --git a/application/admin/view/wdsxh/member/level/index.html b/application/admin/view/wdsxh/member/level/index.html
index b52792a..d1bbaf0 100644
--- a/application/admin/view/wdsxh/member/level/index.html
+++ b/application/admin/view/wdsxh/member/level/index.html
@@ -1,5 +1,5 @@
 <div class="panel panel-default panel-intro">
-    
+
     <div class="panel-heading">
         {:build_heading(null,FALSE)}
         <ul class="nav nav-tabs" data-field="status">
@@ -10,7 +10,6 @@
         </ul>
     </div>
 
-
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
             <div class="tab-pane fade active in" id="one">
@@ -20,7 +19,6 @@
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('wdsxh/member/level/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('wdsxh/member/level/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('wdsxh/member/level/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        
 
                         <div class="dropdown btn-group {:$auth->check('wdsxh/member/level/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
@@ -30,19 +28,14 @@
                                 {/foreach}
                             </ul>
                         </div>
-
-                        
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('wdsxh/member/level/edit')}"
                            data-operate-del="{:$auth->check('wdsxh/member/level/del')}"
-                           
                            width="100%">
                     </table>
                 </div>
             </div>
-
         </div>
     </div>
 </div>
-
diff --git a/application/admin/view/wdsxh/member/rights_project/add.html b/application/admin/view/wdsxh/member/rights_project/add.html
index ce4b30f..ee6f788 100755
--- a/application/admin/view/wdsxh/member/rights_project/add.html
+++ b/application/admin/view/wdsxh/member/rights_project/add.html
@@ -3,11 +3,20 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">权益项目:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-name" data-rule="required" class="form-control" name="row[title]" type="text" placeholder="请输入权益名称">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" placeholder="请输入权益名称">
         </div>
     </div>
 
-
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">入会类型:</label>
+        <div class="col-xs-12 col-sm-8">
+           <select id="input-join-config" name="row[join_config_id]" class="selectpicker form-control" data-live-search="true" placeholder="请选择入会类型">
+               {foreach $join_config as $item}
+               <option value="{$item.id}">{$item.name}</option>
+               {/foreach}
+            </select>
+        </div>
+    </div>
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">状态:</label>
@@ -15,12 +24,10 @@
             <div class="radio">
                 <label>
                     <input id="status_normal" name="row[disabled]" type="radio" value="0" checked> 显示
-
                 </label>
                 <label>
                     <input id="status_hidden" name="row[disabled]" type="radio" value="1"> 隐藏
                 </label>
-
             </div>
         </div>
     </div>
@@ -35,8 +42,6 @@
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
-            <input type="hidden" name="row[join_config_id]" value="{$join_config_id}">
-            <input type="hidden" name="row[level_id]" value="{$Think.get.level_id}">
             <button type="submit" class="btn btn-primary btn-embossed disabled">确认</button>
         </div>
     </div>
diff --git a/application/admin/view/wdsxh/member/rights_project/edit.html b/application/admin/view/wdsxh/member/rights_project/edit.html
index 58886c9..5681446 100755
--- a/application/admin/view/wdsxh/member/rights_project/edit.html
+++ b/application/admin/view/wdsxh/member/rights_project/edit.html
@@ -3,12 +3,20 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">权益项目:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-name" data-rule="required" class="form-control" name="row[title]" value="{$row.title|htmlentities}" type="text" placeholder="请输入权益项目">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" value="{$row.name|htmlentities}" type="text" placeholder="请输入权益项目">
         </div>
     </div>
 
-
-
+    <div class="form-group">
+       <label class="control-label col-xs-12 col-sm-2">入会类型:</label>
+       <div class="col-xs-12 col-sm-8">
+          <select id="input-join-config" name="row[join_config_id]" class="selectpicker form-control" data-live-search="true" placeholder="请选择入会类型">
+              {foreach $join_config as $item}
+              <option value="{$item.id}" {eq name="row.join_config_id" value="$item.id"}selected{/eq}>{$item.name}</option>
+              {/foreach}
+           </select>
+       </div>
+   </div>
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">状态:</label>
@@ -16,7 +24,6 @@
             <div class="radio">
                 <label>
                     <input id="status_normal" name="row[disabled]" type="radio" value="0" {eq name="row.disabled" value="0"}checked{/eq}> 显示
-
                 </label>
                 <label>
                     <input id="status_hidden" name="row[disabled]" type="radio" value="1" {eq name="row.disabled" value="1"}checked{/eq}> 隐藏
@@ -36,8 +43,6 @@
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
-            <input type="hidden" name="row[join_config_id]" value="{$join_config_id}">
-            <input type="hidden" name="row[level_id]" value="{$Think.get.level_id|htmlentities}">
             <button type="submit" class="btn btn-primary btn-embossed disabled">确认</button>
         </div>
     </div>
diff --git a/public/assets/js/backend/wdsxh/member/rights_project.js b/public/assets/js/backend/wdsxh/member/rights_project.js
index a676a8e..e998e3c 100755
--- a/public/assets/js/backend/wdsxh/member/rights_project.js
+++ b/public/assets/js/backend/wdsxh/member/rights_project.js
@@ -30,39 +30,28 @@ define(["jquery", "bootstrap", "backend", "table", "form"], function (
                         { checkbox: true },
                         { field: "id", title: __("Id") },
                         {
-                            field: "title",
-                            title: __("Member Benefits Title"),
+                            field: "name",
+                            title: __("Member Benefits Project Name"),
                             operate: "LIKE",
                         },
-                        {
-                            field: "desc",
-                            title: __("Member Benefits Desc"),
-                            operate: "LIKE",
-                        },
-                        {
-                            field: "image",
-                            title: __("Member Benefits Image"),
-                            operate: false,
-                            formatter: Table.api.formatter.image,
-                        },
                         {
                             field: "sort",
-                            title: __("Member Benefits Sort"),
+                            title: __("Member Benefits Project Sort"),
                             operate: false,
                         },
                         {
                             field: "disabled",
-                            title: __("Member Benefits Status"),
+                            title: __("Member Benefits Project Status"),
                             searchList: {
-                                0: __("Member Benefits Enabled"),
-                                1: __("Member Benefits Disabled"),
+                                0: __("Member Benefits Project Enabled"),
+                                1: __("Member Benefits Project Disabled"),
                             },
                             custom: { 0: "success", 1: "gray" },
                             formatter: Table.api.formatter.status,
                         },
                         {
                             field: "operate",
-                            title: __("Member Benefits Operate"),
+                            title: __("Member Benefits Project Operate"),
                             table: table,
                             events: Table.api.events.operate,
                             formatter: Table.api.formatter.operate,
diff --git a/runtime/.gitkeep b/runtime/.gitkeep
deleted file mode 100644
index d3f5a12..0000000
--- a/runtime/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-