From 1dd45f0c81ebe43d3e5e796654b15b11a76aed7b Mon Sep 17 00:00:00 2001
From: linyaostalker <602604991@qq.com>
Date: Wed, 20 Nov 2019 10:08:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E8=A1=A8=E5=8D=95is=5Fshow=E5=AD=97=E6=AE=B5=E5=8D=95?=
 =?UTF-8?q?=E9=80=89=E6=A1=86=EF=BC=8C=E5=A4=84=E7=90=86=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C=E4=BB=A5=E5=8F=8A=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods/src/controllers/CategoryController.php   |  5 ++++-
 vendor/antgoods/goods/src/models/ars/Category.php  | 14 +++++++++++++-
 .../goods/src/models/searchs/CategorySearch.php    |  1 +
 vendor/antgoods/goods/src/views/category/_form.php |  5 ++---
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/vendor/antgoods/goods/src/controllers/CategoryController.php b/vendor/antgoods/goods/src/controllers/CategoryController.php
index 64017dc..1d96800 100644
--- a/vendor/antgoods/goods/src/controllers/CategoryController.php
+++ b/vendor/antgoods/goods/src/controllers/CategoryController.php
@@ -105,7 +105,10 @@ class CategoryController extends Controller
      */
     public function actionDelete($id)
     {
-        $this->findModel($id)->delete();
+        $model = $this->findModel($id);
+
+        $model->is_delete = Category::IS_DELETE_YES;
+        $model->save();
 
         return $this->redirect(['index']);
     }
diff --git a/vendor/antgoods/goods/src/models/ars/Category.php b/vendor/antgoods/goods/src/models/ars/Category.php
index 9fe01df..212def5 100644
--- a/vendor/antgoods/goods/src/models/ars/Category.php
+++ b/vendor/antgoods/goods/src/models/ars/Category.php
@@ -22,6 +22,18 @@ use yii\behaviors\TimestampBehavior;
  */
 class Category extends \yii\db\ActiveRecord
 {
+    //是否显示is_show
+    const IS_SHOW_DISPLAY = 0;//显示
+    const IS_SHOW_HIDE = 1;//隐藏
+    //是否删除is_delete
+    const IS_DELETE_NO = 0;//未删除
+    const IS_DELETE_YES = 1;//已删除
+
+    public static $isShow = [
+        self::IS_SHOW_DISPLAY => '显示',
+        self::IS_SHOW_HIDE => '隐藏'
+    ];
+
     /**
      * {@inheritdoc}
      */
@@ -56,7 +68,7 @@ class Category extends \yii\db\ActiveRecord
             'sort_order' => '排序',
             'icon_type' => '图标类型',
             'icon' => '图标',
-            'is_show' => '是否显示,1为不显示',
+            'is_show' => '是否显示',
             'is_delete' => '是否删除，1为已删除',
             'created_at' => '创建时间',
             'updated_at' => '更新时间',
diff --git a/vendor/antgoods/goods/src/models/searchs/CategorySearch.php b/vendor/antgoods/goods/src/models/searchs/CategorySearch.php
index 63ad3f0..7ed7c4f 100644
--- a/vendor/antgoods/goods/src/models/searchs/CategorySearch.php
+++ b/vendor/antgoods/goods/src/models/searchs/CategorySearch.php
@@ -121,6 +121,7 @@ class CategorySearch extends Category
     * 条件筛选
     */
     private function filter($query, $dataProvider){
+        $query->andFilterWhere(['is_delete' => 0]);
         if (!$this->validate()) {
             // uncomment the following line if you do not want to return any records when validation fails
             // $query->where('0=1');
diff --git a/vendor/antgoods/goods/src/views/category/_form.php b/vendor/antgoods/goods/src/views/category/_form.php
index d154648..4badc99 100644
--- a/vendor/antgoods/goods/src/views/category/_form.php
+++ b/vendor/antgoods/goods/src/views/category/_form.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use blobt\widgets\Icheck;
 
 /* @var $this yii\web\View */
 /* @var $model antgoods\goods\models\ars\Category */
@@ -22,9 +23,7 @@ use yii\widgets\ActiveForm;
 
     <?= $form->field($model, 'icon')->textInput(['maxlength' => true]) ?>
 
-    <?= $form->field($model, 'is_show')->textInput() ?>
-
-    <?= $form->field($model, 'is_delete')->textInput() ?>
+    <?= $form->field($model, 'is_show')->widget(Icheck::className(), ["items" => $model::$isShow, 'type' => "radio"]) ?>
 
     <div class="form-group">
         <?= Html::submitButton('保存', ['class' => 'btn btn-success']) ?>