From 1d2824575764723e7c2eeffc9c64bc2efd782ef5 Mon Sep 17 00:00:00 2001
From: linyaostalker <602604991@qq.com>
Date: Wed, 20 Nov 2019 19:20:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E5=9B=A0=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E4=B8=8A=E4=BC=A0=E6=8F=92=E4=BB=B6=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods/src/controllers/GoodsController.php | 10 +++++++++
 .../antgoods/goods/src/views/goods/_form.php  | 12 +++++-----
 vendor/iron/widgets/Upload.php                | 22 ++++++++++---------
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/vendor/antgoods/goods/src/controllers/GoodsController.php b/vendor/antgoods/goods/src/controllers/GoodsController.php
index 7180f54..ce4d2a2 100644
--- a/vendor/antgoods/goods/src/controllers/GoodsController.php
+++ b/vendor/antgoods/goods/src/controllers/GoodsController.php
@@ -29,6 +29,16 @@ class GoodsController extends Controller
         ];
     }
 
+    public function actions()
+    {
+        return [
+            'upload' => [
+                'class' => 'iron\actions\UploadAction',
+                'path' => 'xls/'
+            ]
+        ];
+    }
+
     /**
      * Lists all Goods models.
      * @return mixed
diff --git a/vendor/antgoods/goods/src/views/goods/_form.php b/vendor/antgoods/goods/src/views/goods/_form.php
index 713eb61..a3268b0 100644
--- a/vendor/antgoods/goods/src/views/goods/_form.php
+++ b/vendor/antgoods/goods/src/views/goods/_form.php
@@ -16,6 +16,12 @@ use antgoods\goods\models\ars\Supplier;
 
     <?php $form = ActiveForm::begin(); ?>
 
+    <?= $form->field($model, 'image')->widget(\iron\widgets\Upload::className(), [
+        'url' => 'upload',
+        'deleteUrl' => 'imageDel',
+        'dragdropWidth'=> 800
+    ]) ?>
+
     <?= $form->field($model, 'cat_id')->dropDownList(Category::modelColumn(), ['prompt' => '请选择']) ?>
 
     <?= $form->field($model, 'brand_id')->dropDownList(Brand::modelColumn(), ['prompt' => '请选择']) ?>
@@ -56,12 +62,6 @@ use antgoods\goods\models\ars\Supplier;
 
     <?= $form->field($model, 'description')->textarea(['rows' => 6]) ?>
 
-    <?= $form->field($model, 'image')->widget(\iron\widgets\Upload::className(), [
-        'url' => 'upload',
-        'deleteUrl' => 'imageDel',
-        'dragdropWidth'=> 800
-    ]) ?>
-
     <?= $form->field($model, 'model_id')->textInput() ?>
 
     <?= $form->field($model, 'is_sale')->radioList($model::$isSale) ?>
diff --git a/vendor/iron/widgets/Upload.php b/vendor/iron/widgets/Upload.php
index 0842c80..5c8f546 100644
--- a/vendor/iron/widgets/Upload.php
+++ b/vendor/iron/widgets/Upload.php
@@ -201,15 +201,17 @@ SCRIPT;
      */
     protected function renderUploadHtml()
     {
-        return '<div id="upload-file">
-                <div class="ajax-upload-dragdrop" style="vertical-align: top; width: 600px;">
-                    <div class="ajax-file-upload" style="position: relative; overflow: hidden; cursor: default;">Upload
-                        <form method="POST" action="upload.php" enctype="multipart/form-data" style="margin: 0px; padding: 0px;">
-                            <input type="file" id="ajax-upload-id-1573635462220" name="myfile[]" accept="*" multiple="" style="position: absolute; cursor: pointer; top: 0px; width: 100%; height: 100%; left: 0px; z-index: 100; opacity: 0;">
-                        </form>
-                    </div>
-                    <span><b>Drag &amp; Drop Files</b></span>
-                </div>
-            <div>';
+        return '<div class="box-body">
+                    <div id="upload-file">
+                        <div class="ajax-upload-dragdrop" style="vertical-align: top; width: 600px;">
+                            <div class="ajax-file-upload" style="position: relative; overflow: hidden; cursor: default;">Upload
+                                <form method="POST" action="upload.php" enctype="multipart/form-data" style="margin: 0px; padding: 0px;">
+                                    <input type="file" id="ajax-upload-id-1573635462220" name="myfile[]" accept="*" multiple="" style="position: absolute; cursor: pointer; top: 0px; width: 100%; height: 100%; left: 0px; z-index: 100; opacity: 0;">
+                                </form>
+                            </div>
+                            <span><b>Drag &amp; Drop Files</b></span>
+                        </div>
+                    <div>
+                </div>';
     }
 }