diff --git a/application/admin/controller/wdsxh/member/Level.php b/application/admin/controller/wdsxh/member/Level.php index bf8ec1d..236efce 100644 --- a/application/admin/controller/wdsxh/member/Level.php +++ b/application/admin/controller/wdsxh/member/Level.php @@ -35,13 +35,15 @@ class Level extends Backend protected $model = null; protected $modelValidate = true; protected $pay_method = null; - protected $member_benefit_model = null; + protected $benefit_model = null; + protected $join_config_model = null; public function _initialize() { parent::_initialize(); $this->model = new \app\admin\model\wdsxh\member\Level; - $this->member_benefit_model = new \app\admin\model\wdsxh\member\MemberBenefits; + $this->benefit_model = new \app\admin\model\wdsxh\member\MemberBenefits; + $this->join_config_model = new \app\admin\model\wdsxh\member\JoinConfig; $this->view->assign("statusList", $this->model->getStatusList()); $pay_method = (new FeesConfig())->where('id',1)->value('pay_method'); $this->pay_method = $pay_method; @@ -114,8 +116,12 @@ class Level extends Backend public function add() { if (false === $this->request->isPost()) { - $benefits = $this->member_benefit_model->getSimpleByStatus(0); + $benefits = $this->benefit_model->getSimpleByStatus(0); $this->view->assign('benefits', $benefits); + + $join_config = $this->join_config_model->getSimpleByStatus(); + $this->view->assign('join_config', $join_config); + return $this->view->fetch(); } $params = $this->request->post('row/a'); @@ -170,11 +176,14 @@ class Level extends Backend $this->error(__('You have no permission')); } if (false === $this->request->isPost()) { - $benefits = $this->member_benefit_model->getSimpleByStatus(0); + $benefits = $this->benefit_model->getSimpleByStatus(0); $this->view->assign('benefits', $benefits); if (is_null($row['benefits_id'])) { $row['benefits_id'] = []; } + $join_config = $this->join_config_model->getSimpleByStatus(); + $this->view->assign('join_config', $join_config); + $this->view->assign('row', $row); return $this->view->fetch(); } diff --git a/application/admin/controller/wdsxh/member/Rights.php b/application/admin/controller/wdsxh/member/Rights.php index f58d1cd..8c128d7 100755 --- a/application/admin/controller/wdsxh/member/Rights.php +++ b/application/admin/controller/wdsxh/member/Rights.php @@ -20,11 +20,16 @@ use app\common\controller\Backend; */ class Rights extends Backend { + protected $join_config_model = null; + public function _initialize() { parent::_initialize(); $this->model = new \app\admin\model\wdsxh\member\MemberBenefits(); $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']; } } diff --git a/application/admin/model/wdsxh/member/JoinConfig.php b/application/admin/model/wdsxh/member/JoinConfig.php index c5c89b4..075ddc3 100644 --- a/application/admin/model/wdsxh/member/JoinConfig.php +++ b/application/admin/model/wdsxh/member/JoinConfig.php @@ -16,13 +16,13 @@ use think\Model; class JoinConfig extends Model { - + // 表名 protected $name = 'wdsxh_member_join_config'; - + // 自动写入时间戳字段 protected $autoWriteTimestamp = false; @@ -36,9 +36,9 @@ class JoinConfig extends Model 'type_text', 'status_text' ]; - - + + public function getTypeList() { return ['1' => __('Type 1'), '2' => __('Type 2'), '3' => __('Type 3')]; @@ -115,7 +115,12 @@ class JoinConfig extends Model return $data; } - - - + public function getSimpleByStatus($status = 'normal') + { + return Self::field(['id', 'name'])->where(function($query) use ($status) { + if (null !== $status) { + $query->where('status', '=', $status); + } + })->order('weigh', 'asc')->select(); + } } diff --git a/application/admin/view/wdsxh/member/level/add.html b/application/admin/view/wdsxh/member/level/add.html index 513ec82..24e431f 100644 --- a/application/admin/view/wdsxh/member/level/add.html +++ b/application/admin/view/wdsxh/member/level/add.html @@ -27,8 +27,9 @@
diff --git a/application/admin/view/wdsxh/member/level/edit.html b/application/admin/view/wdsxh/member/level/edit.html index 705cbee..561065e 100644 --- a/application/admin/view/wdsxh/member/level/edit.html +++ b/application/admin/view/wdsxh/member/level/edit.html @@ -27,8 +27,9 @@
diff --git a/application/admin/view/wdsxh/member/rights/add.html b/application/admin/view/wdsxh/member/rights/add.html index e549edc..fbb8852 100755 --- a/application/admin/view/wdsxh/member/rights/add.html +++ b/application/admin/view/wdsxh/member/rights/add.html @@ -6,13 +6,14 @@ - +
- + {foreach $join_config as $item} + + {/foreach}
diff --git a/application/admin/view/wdsxh/member/rights/edit.html b/application/admin/view/wdsxh/member/rights/edit.html index a46b7d3..8da2248 100755 --- a/application/admin/view/wdsxh/member/rights/edit.html +++ b/application/admin/view/wdsxh/member/rights/edit.html @@ -9,9 +9,10 @@
- + {foreach $join_config as $item} + + {/foreach}