From 067866973bfc63ac35e06d5ed5f66660584c8c33 Mon Sep 17 00:00:00 2001
From: linyaostalker <602604991@qq.com>
Date: Wed, 20 Nov 2019 10:29:44 +0800
Subject: [PATCH] =?UTF-8?q?antgoods=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=93=81=E7=89=8C=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/views/layouts/sidebar.php                         | 1 +
 .../antgoods/goods/src}/controllers/BrandController.php   | 6 +++---
 .../antgoods/goods/src}/models/searchs/BrandSearch.php    | 6 +++---
 .../antgoods/goods/src}/views/brand/_form.php             | 2 +-
 .../antgoods/goods/src}/views/brand/_search.php           | 8 +++++---
 .../antgoods/goods/src}/views/brand/create.php            | 2 +-
 .../antgoods/goods/src}/views/brand/index.php             | 4 ++--
 .../antgoods/goods/src}/views/brand/update.php            | 2 +-
 .../antgoods/goods/src}/views/brand/view.php              | 2 +-
 9 files changed, 18 insertions(+), 15 deletions(-)
 rename {backend => vendor/antgoods/goods/src}/controllers/BrandController.php (96%)
 mode change 100755 => 100644
 rename {common => vendor/antgoods/goods/src}/models/searchs/BrandSearch.php (95%)
 mode change 100755 => 100644
 rename {backend => vendor/antgoods/goods/src}/views/brand/_form.php (91%)
 mode change 100755 => 100644
 rename {backend => vendor/antgoods/goods/src}/views/brand/_search.php (92%)
 mode change 100755 => 100644
 rename {backend => vendor/antgoods/goods/src}/views/brand/create.php (86%)
 mode change 100755 => 100644
 rename {backend => vendor/antgoods/goods/src}/views/brand/index.php (92%)
 mode change 100755 => 100644
 rename {backend => vendor/antgoods/goods/src}/views/brand/update.php (89%)
 mode change 100755 => 100644
 rename {backend => vendor/antgoods/goods/src}/views/brand/view.php (92%)
 mode change 100755 => 100644

diff --git a/backend/views/layouts/sidebar.php b/backend/views/layouts/sidebar.php
index 720c666..54868f1 100755
--- a/backend/views/layouts/sidebar.php
+++ b/backend/views/layouts/sidebar.php
@@ -23,6 +23,7 @@ use iron\widgets\Menu;
                 ['label' => '商品管理', 'url' => '#', 'icon' => 'far fa-archive', 'items' => [
                     ['label' => '商品列表', 'url' => ['/antgoods/goods/index']],
                     ['label' => '商品分类', 'url' => ['/antgoods/category/index']],
+                    ['label' => '品牌管理', 'url' => ['/antgoods/brand/index']],
                 ]
                 ],
                 ['label' => '订单管理', 'url' => '#', 'icon' => 'far fa-list-alt', 'items' => [
diff --git a/backend/controllers/BrandController.php b/vendor/antgoods/goods/src/controllers/BrandController.php
old mode 100755
new mode 100644
similarity index 96%
rename from backend/controllers/BrandController.php
rename to vendor/antgoods/goods/src/controllers/BrandController.php
index 0dd6523..35e5f83
--- a/backend/controllers/BrandController.php
+++ b/vendor/antgoods/goods/src/controllers/BrandController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace backend\controllers;
+namespace antgoods\goods\controllers;
 
 use Yii;
-use common\models\ars\Brand;
-use common\models\searchs\BrandSearch;
+use antgoods\goods\models\ars\Brand;
+use antgoods\goods\models\searchs\BrandSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
diff --git a/common/models/searchs/BrandSearch.php b/vendor/antgoods/goods/src/models/searchs/BrandSearch.php
old mode 100755
new mode 100644
similarity index 95%
rename from common/models/searchs/BrandSearch.php
rename to vendor/antgoods/goods/src/models/searchs/BrandSearch.php
index c75e607..589a2fb
--- a/common/models/searchs/BrandSearch.php
+++ b/vendor/antgoods/goods/src/models/searchs/BrandSearch.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace common\models\searchs;
+namespace antgoods\goods\models\searchs;
 
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use yii\helpers\ArrayHelper;
-use common\models\ars\Brand;
+use antgoods\goods\models\ars\Brand;
 
 /**
- * BrandSearch represents the model behind the search form of `common\models\ars\Brand`.
+ * BrandSearch represents the model behind the search form of `antgoods\goods\models\ars\Brand`.
  */
 class BrandSearch extends Brand
 {
diff --git a/backend/views/brand/_form.php b/vendor/antgoods/goods/src/views/brand/_form.php
old mode 100755
new mode 100644
similarity index 91%
rename from backend/views/brand/_form.php
rename to vendor/antgoods/goods/src/views/brand/_form.php
index 036e9f6..9f7f050
--- a/backend/views/brand/_form.php
+++ b/vendor/antgoods/goods/src/views/brand/_form.php
@@ -4,7 +4,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
 /* @var $this yii\web\View */
-/* @var $model common\models\ars\Brand */
+/* @var $model antgoods\goods\models\ars\Brand */
 /* @var $form yii\widgets\ActiveForm */
 ?>
 
diff --git a/backend/views/brand/_search.php b/vendor/antgoods/goods/src/views/brand/_search.php
old mode 100755
new mode 100644
similarity index 92%
rename from backend/views/brand/_search.php
rename to vendor/antgoods/goods/src/views/brand/_search.php
index 14a96ae..ed21354
--- a/backend/views/brand/_search.php
+++ b/vendor/antgoods/goods/src/views/brand/_search.php
@@ -15,8 +15,8 @@ use \blobt\widgets\DateRangePicker;
             'validateOnType' => true,
         ]);
 ?>
-<div class="col-sm-12">
-    <div class="dataTables_filter">
+<div class="row">
+    <div class="col">
         <?= $form->field($model, 'id', [
             "template" => "{input}{error}",
             "inputOptions" => [
@@ -28,6 +28,8 @@ use \blobt\widgets\DateRangePicker;
             ]
         ])
         ?>
+    </div>
+    <div class="col">
         <?= $form->field($model, "created_at_range", [
             "template" => "{input}{error}",
             "inputOptions" => [
@@ -38,10 +40,10 @@ use \blobt\widgets\DateRangePicker;
             ]
         ])->widget(DateRangePicker::className());
         ?>
+    </div>
         <div class="form-group">
             <?= Html::submitButton('<i class="fa fa-filter"></i>', ['class' => 'btn btn-default']) ?>
             <?= Html::resetButton('<i class="fa fa-eraser"></i>', ['class' => 'btn btn-default']) ?>
         </div>
-    </div>
 </div>
 <?php ActiveForm::end(); ?>
\ No newline at end of file
diff --git a/backend/views/brand/create.php b/vendor/antgoods/goods/src/views/brand/create.php
old mode 100755
new mode 100644
similarity index 86%
rename from backend/views/brand/create.php
rename to vendor/antgoods/goods/src/views/brand/create.php
index c768fcb..ca5f84b
--- a/backend/views/brand/create.php
+++ b/vendor/antgoods/goods/src/views/brand/create.php
@@ -3,7 +3,7 @@
 use yii\helpers\Html;
 
 /* @var $this yii\web\View */
-/* @var $model common\models\ars\Brand */
+/* @var $model antgoods\goods\models\ars\Brand */
 
 $this->title = '创建 Brand';
 $this->params['breadcrumbs'][] = ['label' => 'Brands', 'url' => ['index']];
diff --git a/backend/views/brand/index.php b/vendor/antgoods/goods/src/views/brand/index.php
old mode 100755
new mode 100644
similarity index 92%
rename from backend/views/brand/index.php
rename to vendor/antgoods/goods/src/views/brand/index.php
index f799f7a..4abe0dd
--- a/backend/views/brand/index.php
+++ b/vendor/antgoods/goods/src/views/brand/index.php
@@ -1,7 +1,7 @@
 <?php
 
 use yii\helpers\Html;
-use blobt\grid\GridView;
+use iron\grid\GridView;
 
 /* @var $this yii\web\View */
 /* @var $searchModel common\models\searchs\BrandSearch */
@@ -11,7 +11,7 @@ $this->title = 'Brands';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="row">
-    <div class="col-xs-12">
+    <div class="col-12">
         <?= GridView::widget([
                 'dataProvider' => $dataProvider,
                 'filter' => $this->render("_search", ['model' => $searchModel]),
diff --git a/backend/views/brand/update.php b/vendor/antgoods/goods/src/views/brand/update.php
old mode 100755
new mode 100644
similarity index 89%
rename from backend/views/brand/update.php
rename to vendor/antgoods/goods/src/views/brand/update.php
index 453ee2f..7884a9c
--- a/backend/views/brand/update.php
+++ b/vendor/antgoods/goods/src/views/brand/update.php
@@ -3,7 +3,7 @@
 use yii\helpers\Html;
 
 /* @var $this yii\web\View */
-/* @var $model common\models\ars\Brand */
+/* @var $model antgoods\goods\models\ars\Brand */
 
 $this->title = '编辑 Brand: ' . $model->name;
 $this->params['breadcrumbs'][] = ['label' => 'Brands', 'url' => ['index']];
diff --git a/backend/views/brand/view.php b/vendor/antgoods/goods/src/views/brand/view.php
old mode 100755
new mode 100644
similarity index 92%
rename from backend/views/brand/view.php
rename to vendor/antgoods/goods/src/views/brand/view.php
index 814b5be..c592ea0
--- a/backend/views/brand/view.php
+++ b/vendor/antgoods/goods/src/views/brand/view.php
@@ -4,7 +4,7 @@ use yii\helpers\Html;
 use yii\widgets\DetailView;
 
 /* @var $this yii\web\View */
-/* @var $model common\models\ars\Brand */
+/* @var $model antgoods\goods\models\ars\Brand */
 
 $this->title = $model->name;
 $this->params['breadcrumbs'][] = ['label' => 'Brands', 'url' => ['index']];