Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/hainan

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`;

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('单位：分钟。超过这个时间未支付尾款，订单将自动关闭，且订金不退');

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.*?>.*?<\/script>/is', '', $v));
             $show->field('content')->unescape()->as(fn($v) => preg_replace('/<script.*?>.*?<\/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->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->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(

ready.md

@@ -6,6 +6,7 @@
 5、关于我们、注册协议、购买协议等信息；
 6、启动订单超时定时器；
 7、总后台设置->提交，代理商设置提交；
+8、配置微信支付证书（退款用）；
 
 ```sql
 # 11:12 2021/8/26

resources/lang/zh_CN/product.php

@@ -13,6 +13,7 @@ return [
         'picture' => '产品图片',
         'price' => '售价',
         'sale' => '销量',
+        'service_persons' => '涉及用户数',
         'status' => '状态',
         'stock' => '库存',
         'supplier_id' => '供应商ID',