From 2383d24c12d9fc0bacb9b7e35720f3bb5c6689b0 Mon Sep 17 00:00:00 2001
From: JerryYan <792602257@qq.com>
Date: Wed, 19 Aug 2020 13:07:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=98=BE=E7=A4=BA=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hyhproject/admin/view/trade_rule/trade_rule.js | 2 +-
 hyhproject/app/controller/TradeRule.php        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hyhproject/admin/view/trade_rule/trade_rule.js b/hyhproject/admin/view/trade_rule/trade_rule.js
index 494d0d6..8f15da2 100644
--- a/hyhproject/admin/view/trade_rule/trade_rule.js
+++ b/hyhproject/admin/view/trade_rule/trade_rule.js
@@ -5,7 +5,7 @@ function initGrid(){
             {title:'文章ID', name:'id' ,width:30,sortable:true},
             {title:'标题', name:'title' ,width:200,sortable:true},
             {title:'是否显示', name:'isShow' ,width:50,sortable:true, renderer: function(val,item,rowIndex){
-                return '<form autocomplete="off" class="layui-form" lay-filter="gridForm"><input type="checkbox" id="isShow" name="isShow" '+((item['isShow']==1)?"checked":"")+' lay-skin="switch" value="1" lay-filter="isShow" lay-text="显示|隐藏" data="'+item['articleId']+'"></form>';
+                return '<form autocomplete="off" class="layui-form" lay-filter="gridForm"><input type="checkbox" id="isShow" name="isShow" '+((item['isShow']==1)?"checked":"")+' lay-skin="switch" value="1" lay-filter="isShow" lay-text="显示|隐藏" data="'+item['id']+'"></form>';
             }},
             {title:'创建时间', name:'create_time' ,width:120,sortable:true},
             {title:'操作', name:'' ,width:100, align:'center', renderer: function(val,item,rowIndex){
diff --git a/hyhproject/app/controller/TradeRule.php b/hyhproject/app/controller/TradeRule.php
index 3b9bf85..0b5a78a 100644
--- a/hyhproject/app/controller/TradeRule.php
+++ b/hyhproject/app/controller/TradeRule.php
@@ -12,6 +12,7 @@ class TradeRule extends Base
     {
         $model = Db::name("trade_rule")->field(true)
             ->order("create_time", "desc")
+            ->where('isShow', '1')
             ->select();
         foreach ($model as &$detail) {
             $detail['content'] = htmlspecialchars_decode($detail['content']);