From 3d2648146365a70bf0147d89ecf978e49864afcd Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Thu, 17 Sep 2020 21:08:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=9A=84=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/v3/CouponController.php | 4 ++--
 app/Admin/Controllers/v3/GoodsController.php  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Admin/Controllers/v3/CouponController.php b/app/Admin/Controllers/v3/CouponController.php
index 7e50398..029a03a 100644
--- a/app/Admin/Controllers/v3/CouponController.php
+++ b/app/Admin/Controllers/v3/CouponController.php
@@ -150,8 +150,8 @@ class CouponController extends AdminController
             $form->column(6,function(Form $form){
                 $form->text('title')->required()->maxLength(255,'最多只能输入500个字');
                 $form->textarea('introduce')->required();
-                $form->currency('full_amount')->required()->floatTwo()->symbol('￥');
-                $form->currency('discounts')->required()->floatTwo()->symbol('￥');
+                $form->currency('full_amount')->required()->symbol('￥');
+                $form->currency('discounts')->required()->symbol('￥');
                 $form->radio('discount_type')->options(CouponModel::$_DISCOUNTTYPE)->default(1);
                 $form->number('inventory')->required()->type('number')->attribute('min', 1)->default(1);
                 $form->number('weigh')->type('number')->attribute('min', 0)->default(0);
diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php
index d86509b..c56c975 100644
--- a/app/Admin/Controllers/v3/GoodsController.php
+++ b/app/Admin/Controllers/v3/GoodsController.php
@@ -191,16 +191,16 @@ class GoodsController extends AdminController
             $form->column(6, function (Form $form) use($storeList,$categoryList,$goodsCategoryList ){
                 $form->hidden('market_id')->default(0);
                 $form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list');
-                $form->select('goods_category_id')->required();
+                $form->select('goods_category_id');
                 $form->select('store_id')->required()->options($storeList);
                 $form->text('name')->required()->maxLength(20);
                 $form->image('cover_img')->autoUpload()->required();
                 $form->number('sort');
             });
             $form->column(6, function (Form $form) {
-                $form->currency('price')->required()->floatTwo()->symbol('￥');
-                $form->currency('original_price')->required()->floatTwo()->symbol('￥');
-                $form->currency('vip_price')->required()->floatTwo()->symbol('￥');
+                $form->currency('price')->required()->symbol('￥');
+                $form->currency('original_price')->required()->symbol('￥');
+                $form->currency('vip_price')->required()->symbol('￥');
                 $form->text('goods_unit')->help('如：斤，个，盒，500克，1000克，1500克等');
                 $form->radio('is_infinite')->options(['关闭','开启'])->default(1);
                 $form->number('inventory')->required()->attribute('min', 1)->default(1);