From f0f66d3aaa19391641bfef223c9827e29ee49163 Mon Sep 17 00:00:00 2001
From: lemon <15040771@qq.com>
Date: Mon, 11 Oct 2021 17:22:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E9=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Admin/Controllers/DepositController.php | 8 ++--
.../Controllers/DepositLogController.php | 48 +++++++++----------
.../Controllers/IndustryProductController.php | 2 +-
.../Controllers/ProductController.php | 2 +-
4 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/app/Admin/Controllers/DepositController.php b/app/Admin/Controllers/DepositController.php
index 162ee06..d83e801 100644
--- a/app/Admin/Controllers/DepositController.php
+++ b/app/Admin/Controllers/DepositController.php
@@ -32,8 +32,8 @@ class DepositController extends AdminController
$grid->column('id')->sortable();
$grid->column('name');
$grid->column('deposit_normal','正常');
- $grid->column('deposit_frozen','冻结中');
- $grid->column('deposit_used','已消费');
+ //$grid->column('deposit_frozen','冻结中');
+ //$grid->column('deposit_used','已消费');
});
}
@@ -48,8 +48,8 @@ class DepositController extends AdminController
$form->decimal('deposit_normal','正常')->rules('required|numeric|min:0|not_in:0',[
'*' => '金额为必填字段且必须大于0',
]);
- $form->decimal('deposit_frozen','冻结中')->disable();
- $form->decimal('deposit_used','已消费')->disable();
+ //$form->decimal('deposit_frozen','冻结中')->disable();
+ //$form->decimal('deposit_used','已消费')->disable();
$form->disableCreatingCheck();
$form->disableViewButton();
$form->disableDeleteButton();
diff --git a/app/AdminSupplier/Controllers/DepositLogController.php b/app/AdminSupplier/Controllers/DepositLogController.php
index dbea6c9..51efb02 100755
--- a/app/AdminSupplier/Controllers/DepositLogController.php
+++ b/app/AdminSupplier/Controllers/DepositLogController.php
@@ -34,7 +34,7 @@ class DepositLogController extends AdminController
)
->body(function (Row $row) {
- $row->column(4, function (Column $column) {
+ $row->column(3, function (Column $column) {
$column->row(Card::make('正常', function () {
$price = Admin::user()->deposit_normal ?? 0;
return <<column(4, function (Column $column) {
- $column->row(Card::make('冻结', function () {
- $price = Admin::user()->deposit_frozen ?? 0;
- return <<
- $price
-
-HTML;
- }));
-
- });
-
- $row->column(4, function (Column $column) {
- $column->row(Card::make('消费', function () {
- $price = Admin::user()->deposit_used ?? 0;
- return <<
- $price
-
-HTML;
- }));
-
- });
+// $row->column(4, function (Column $column) {
+// $column->row(Card::make('冻结', function () {
+// $price = Admin::user()->deposit_frozen ?? 0;
+// return <<
+// $price
+//
+//HTML;
+// }));
+//
+// });
+//
+// $row->column(4, function (Column $column) {
+// $column->row(Card::make('消费', function () {
+// $price = Admin::user()->deposit_used ?? 0;
+// return <<
+// $price
+//
+//HTML;
+// }));
+//
+// });
})
->body(
diff --git a/app/AdminSupplier/Controllers/IndustryProductController.php b/app/AdminSupplier/Controllers/IndustryProductController.php
index 2845109..1e70f6f 100644
--- a/app/AdminSupplier/Controllers/IndustryProductController.php
+++ b/app/AdminSupplier/Controllers/IndustryProductController.php
@@ -116,7 +116,7 @@ class IndustryProductController extends AdminController
$form->text('title')->required();
$form->currency('price')->required();
$form->currency('original_price')->required();
- $form->number('service_persons')->min(0)->required();
+ //$form->number('service_persons')->min(0)->required();
$form->number('stock')->required();
$form->number('min_sale')->min(1)->required();
if ($form->isEditing() && in_array($form->model()->status, [ProductStatus::SOLD_OUT, ProductStatus::ON_SALE])) {
diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php
index 20c64f3..61be979 100644
--- a/app/AdminSupplier/Controllers/ProductController.php
+++ b/app/AdminSupplier/Controllers/ProductController.php
@@ -148,7 +148,7 @@ class ProductController extends AdminController
.has-many-spec .input-group>.form-control:not(:first-child){border-radius:.25rem;}');
Admin::script(file_get_contents(resource_path('js/supplier-batch-add-spec.js')));
})->useTable()->required();
- $form->number('service_persons')->min(1)->default(1)->required();
+ //$form->number('service_persons')->min(1)->default(1)->required();
if ($form->isEditing() && in_array($form->model()->status, [ProductStatus::SOLD_OUT, ProductStatus::ON_SALE])) {
$form->radio('status')->options([1 => '上架', -2 => '下架'])->default(1);
}