From 7eb04904f3f5b92fda55a79565498e814a79e58b Mon Sep 17 00:00:00 2001 From: liapples Date: Thu, 16 Sep 2021 16:56:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ready.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ready.md b/ready.md index be36952..be60ceb 100644 --- a/ready.md +++ b/ready.md @@ -6,6 +6,7 @@ 5、关于我们、注册协议、购买协议等信息； 6、启动订单超时定时器； 7、总后台设置->提交，代理商设置提交； +8、配置微信支付证书（退款用）； ```sql # 11:12 2021/8/26 From 5b047262844bc43144e3f37892be7b97d155e64b Mon Sep 17 00:00:00 2001 From: liapples Date: Thu, 16 Sep 2021 16:56:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B6=89=E5=8F=8A?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MySQL_change.sql | 3 +++ app/AdminSupplier/Controllers/ProductController.php | 12 ++++++------ resources/lang/zh_CN/product.php | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/MySQL_change.sql b/MySQL_change.sql index e69de29..cd6cbcf 100644 --- a/MySQL_change.sql +++ b/MySQL_change.sql @@ -0,0 +1,3 @@ +# 16:37 2021/9/16 +ALTER TABLE `products` + ADD COLUMN `service_persons` INT NOT NULL DEFAULT '1' COMMENT '涉及用户数' AFTER `content`; diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php index 5c553cc..3915c46 100644 --- a/app/AdminSupplier/Controllers/ProductController.php +++ b/app/AdminSupplier/Controllers/ProductController.php @@ -13,8 +13,6 @@ use Dcat\Admin\Form\NestedForm; use Dcat\Admin\Grid; use Dcat\Admin\Show; use Dcat\Admin\Http\Controllers\AdminController; -use Dcat\Admin\Widgets\Card; -use Dcat\Admin\Widgets\Table; use Illuminate\Support\Facades\DB; class ProductController extends AdminController @@ -72,6 +70,7 @@ class ProductController extends AdminController $show->field('pictures')->image('', 80, 80); $show->field('stock'); $show->field('sale'); + $show->field('service_persons'); $show->field('status'); $show->field('know')->unescape()->as(fn($v) => preg_replace('/.*?<\/script>/is', '', $v)); $show->field('content')->unescape()->as(fn($v) => preg_replace('/.*?<\/script>/is', '', $v)); @@ -101,13 +100,14 @@ class ProductController extends AdminController $options = Category::selectOptions(fn($query) => $query->where('agent_id', 0)); $form->select('category_id')->options(array_slice($options, 1, null, true))->required(); $form->text('title')->required(); - $form->text('price')->required(); - $form->text('original_price')->required(); + $form->number('price')->min(0)->required(); + $form->number('original_price')->min(0)->required(); + $form->number('service_persons')->min(0)->required(); + $form->number('stock')->min(0)->required(); $form->multipleImage('pictures')->required()->removable(false)->retainable()->uniqueName(); - $form->text('stock')->default(99999)->required(); $form->editor('know'); $form->editor('content')->required(); - $form->text('verify_mobile','核销员手机'); + $form->mobile('verify_mobile','核销员手机号')->required(); //扩展字段 $publish_type = array_intersect_key( diff --git a/resources/lang/zh_CN/product.php b/resources/lang/zh_CN/product.php index fc1e4e2..a4ec76e 100644 --- a/resources/lang/zh_CN/product.php +++ b/resources/lang/zh_CN/product.php @@ -13,6 +13,7 @@ return [ 'picture' => '产品图片', 'price' => '售价', 'sale' => '销量', + 'service_persons' => '涉及用户数', 'status' => '状态', 'stock' => '库存', 'supplier_id' => '供应商ID', From eff85a3b91f0bb6aea477c000a0bf769400e3f3d Mon Sep 17 00:00:00 2001 From: liapples Date: Thu, 16 Sep 2021 18:15:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?number=E6=94=B9=E4=B8=BAcurrency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/AdminAgent/Controllers/AgentProductController.php | 8 ++++---- app/AdminSupplier/Controllers/ProductController.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/AdminAgent/Controllers/AgentProductController.php b/app/AdminAgent/Controllers/AgentProductController.php index db3cf35..035321a 100644 --- a/app/AdminAgent/Controllers/AgentProductController.php +++ b/app/AdminAgent/Controllers/AgentProductController.php @@ -231,8 +231,8 @@ class AgentProductController extends AdminController ->model(\App\Models\AgentProduct::class); }); } - $form->number('price')->min(0)->required(); - $form->number('original_price')->min(0)->required(); + $form->currency('price')->symbol('￥')->required(); + $form->currency('original_price')->symbol('￥')->required(); $form->number('sale')->min(0)->default(0); $form->number('stock')->min(0)->default(8888)->required(); @@ -276,11 +276,11 @@ class AgentProductController extends AdminController $options = Channel::selectOptions(fn($query) => $query->where('agent_id', $agent_id)); $form->multipleSelect('channel_id')->options(array_slice($options, 1, null, true)); - $form->number('earnest')->min(0) + $form->currency('earnest')->symbol('￥') ->default(0)->help('单位：元。不输入或输入 0 则不支持定金支付，必须和定金超时时间同时设置才会生效'); $form->number('earnest_timeout')->min(0) ->default(0)->help('单位：分钟。超过这个时间未支付尾款，订单将自动关闭，且定金不退'); - $form->number('deposit')->min(0) + $form->currency('deposit')->symbol('￥') ->default(0)->help('单位：元。不输入或输入 0 则不支持订金支付，必须和订金超时时间同时设置才会生效'); $form->number('deposit_timeout')->min(0) ->default(0)->help('单位：分钟。超过这个时间未支付尾款，订单将自动关闭，且订金不退'); diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php index 3915c46..6edecf4 100644 --- a/app/AdminSupplier/Controllers/ProductController.php +++ b/app/AdminSupplier/Controllers/ProductController.php @@ -100,10 +100,10 @@ class ProductController extends AdminController $options = Category::selectOptions(fn($query) => $query->where('agent_id', 0)); $form->select('category_id')->options(array_slice($options, 1, null, true))->required(); $form->text('title')->required(); - $form->number('price')->min(0)->required(); - $form->number('original_price')->min(0)->required(); - $form->number('service_persons')->min(0)->required(); - $form->number('stock')->min(0)->required(); + $form->currency('price')->symbol('￥')->required(); + $form->currency('original_price')->symbol('￥')->required(); + $form->number('service_persons')->required(); + $form->number('stock')->required(); $form->multipleImage('pictures')->required()->removable(false)->retainable()->uniqueName(); $form->editor('know'); $form->editor('content')->required();