From 6f40f8f248585005d1661bd69e3adb2a3bfda447 Mon Sep 17 00:00:00 2001
From: linyaostalker <602604991@qq.com>
Date: Wed, 4 Dec 2019 14:14:57 +0800
Subject: [PATCH] =?UTF-8?q?antgoods=E7=A7=BB=E5=8A=A8=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 antgoods/assets/AppAsset.php                  |  2 +-
 antgoods/assets/GoodsAttributeAsset.php       | 21 +++++++++++++++++++
 antgoods/assets/GoodsFilterAttributeAsset.php | 20 ++++++++++++++++++
 antgoods/assets/GoodsSkuEditAsset.php         | 20 ++++++++++++++++++
 antgoods/views/goods/attribute.php            |  2 +-
 antgoods/views/goods/filter_attribute.php     |  2 +-
 antgoods/views/goods/goods.php                |  3 ++-
 antgoods/views/goods/sku_edit.php             |  2 +-
 antgoods/views/goods/update.php               |  6 ++++++
 antgoods/views/layouts/main.php               |  2 +-
 10 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100644 antgoods/assets/GoodsAttributeAsset.php
 create mode 100644 antgoods/assets/GoodsFilterAttributeAsset.php
 create mode 100644 antgoods/assets/GoodsSkuEditAsset.php

diff --git a/antgoods/assets/AppAsset.php b/antgoods/assets/AppAsset.php
index 6a7b360..1ba7e78 100755
--- a/antgoods/assets/AppAsset.php
+++ b/antgoods/assets/AppAsset.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace backend\assets;
+namespace antgoods\assets;
 
 use yii\web\AssetBundle;
 
diff --git a/antgoods/assets/GoodsAttributeAsset.php b/antgoods/assets/GoodsAttributeAsset.php
new file mode 100644
index 0000000..6991ec2
--- /dev/null
+++ b/antgoods/assets/GoodsAttributeAsset.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace antgoods\assets;
+
+use yii\web\AssetBundle;
+
+/**
+ * Main backend application asset bundle.
+ */
+class GoodsAttributeAsset extends AssetBundle
+{
+    public $css = [
+    ];
+    public $js = [
+//        'custom/sku.49a56a9198d9c3ec233c.js'
+        'custom/sku.52802ed907a316501cd7.js'
+    ];
+    public $depends = [
+        'yii\web\YiiAsset',
+    ];
+}
diff --git a/antgoods/assets/GoodsFilterAttributeAsset.php b/antgoods/assets/GoodsFilterAttributeAsset.php
new file mode 100644
index 0000000..a3a1d4c
--- /dev/null
+++ b/antgoods/assets/GoodsFilterAttributeAsset.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace antgoods\assets;
+
+use yii\web\AssetBundle;
+
+/**
+ * Main backend application asset bundle.
+ */
+class GoodsFilterAttributeAsset extends AssetBundle
+{
+    public $css = [
+    ];
+    public $js = [
+        'custom/sku.9a46222d01b3d601e5ad.js'
+    ];
+    public $depends = [
+        'yii\web\YiiAsset',
+    ];
+}
diff --git a/antgoods/assets/GoodsSkuEditAsset.php b/antgoods/assets/GoodsSkuEditAsset.php
new file mode 100644
index 0000000..bd7e52a
--- /dev/null
+++ b/antgoods/assets/GoodsSkuEditAsset.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace antgoods\assets;
+
+use yii\web\AssetBundle;
+
+/**
+ * Main backend application asset bundle.
+ */
+class GoodsSkuEditAsset extends AssetBundle
+{
+    public $css = [
+    ];
+    public $js = [
+        'custom/sku_item.6649e882bedbeb22ea3d.js'
+    ];
+    public $depends = [
+        'yii\web\YiiAsset',
+    ];
+}
diff --git a/antgoods/views/goods/attribute.php b/antgoods/views/goods/attribute.php
index cf3b70c..427155d 100755
--- a/antgoods/views/goods/attribute.php
+++ b/antgoods/views/goods/attribute.php
@@ -1,7 +1,7 @@
 <?php
 
 use antgoods\models\ars\Attribute;
-use antgoods\web\GoodsAttributeAsset;
+use antgoods\assets\GoodsAttributeAsset;
 
 $param = [];
 $value = [];
diff --git a/antgoods/views/goods/filter_attribute.php b/antgoods/views/goods/filter_attribute.php
index 9980068..8dc66b8 100755
--- a/antgoods/views/goods/filter_attribute.php
+++ b/antgoods/views/goods/filter_attribute.php
@@ -1,7 +1,7 @@
 <?php
 
 use antgoods\models\ars\Attribute;
-use antgoods\web\GoodsFilterAttributeAsset;
+use antgoods\assets\GoodsFilterAttributeAsset;
 
 $param = [];
 $value = [];
diff --git a/antgoods/views/goods/goods.php b/antgoods/views/goods/goods.php
index 0d2e11d..20748df 100644
--- a/antgoods/views/goods/goods.php
+++ b/antgoods/views/goods/goods.php
@@ -6,6 +6,7 @@ use antgoods\models\ars\ShopCategory;
 use antgoods\models\ars\Supplier;
 use linyao\widgets\Select2;
 use yii\bootstrap4\Html;
+use antgoods\models\ars\Goods;
 
 /* @var $this yii\web\View */
 /* @var $model antgoods\models\ars\Goods */
@@ -49,7 +50,7 @@ use yii\bootstrap4\Html;
 
 <?= $form->field($model, 'brief')->textInput(['maxlength' => true]) ?>
 
-<?= $form->field($model, 'is_sale')->radioList($model::$isSale) ?>
+<?= $form->field($model, 'is_sale')->radioList(Goods::$isSale) ?>
 
 <?= $form->field($model, 'sort_order')->textInput() ?>
 
diff --git a/antgoods/views/goods/sku_edit.php b/antgoods/views/goods/sku_edit.php
index af194a9..d9221dd 100644
--- a/antgoods/views/goods/sku_edit.php
+++ b/antgoods/views/goods/sku_edit.php
@@ -1,6 +1,6 @@
 <?php
 
-use antgoods\web\GoodsSkuEditAsset;
+use antgoods\assets\GoodsSkuEditAsset;
 
 $this->title = '添加SKU';
 $this->params['breadcrumbs'][] = ['label' => '商品列表', 'url' => ['index']];
diff --git a/antgoods/views/goods/update.php b/antgoods/views/goods/update.php
index 221e40a..7a99414 100644
--- a/antgoods/views/goods/update.php
+++ b/antgoods/views/goods/update.php
@@ -44,6 +44,12 @@ Yii::$app->params['bsVersion'] = '4.x';
                         'goodsModel' => $model,
                     ]),
                 ],
+                [
+                    'label' => '<i class="fas fa-ad"></i> 详情上传',
+                    'content' => $this->render('new_editor', ['model' => $model,
+                        'form' => $form,
+                    ]),
+                ],
                 [
                     'label' => '<i class="fas fa-picture-o"></i> 图片上传',
                     'content' => $this->render('picture', [
diff --git a/antgoods/views/layouts/main.php b/antgoods/views/layouts/main.php
index b938779..47fe356 100755
--- a/antgoods/views/layouts/main.php
+++ b/antgoods/views/layouts/main.php
@@ -3,7 +3,7 @@
 /* @var $this \yii\web\View */
 /* @var $content string */
 
-use backend\assets\AppAsset;
+use antgoods\assets\AppAsset;
 use yii\helpers\Html;
 use yii\widgets\Breadcrumbs;
 use common\widgets\Alert;