diff --git a/MySQL_change.sql b/MySQL_change.sql index bdc57f2..ccd884f 100644 --- a/MySQL_change.sql +++ b/MySQL_change.sql @@ -157,3 +157,17 @@ ALTER TABLE `mini_program_templates` # 11:15 2021/9/27 ALTER TABLE `mini_program_upload_logs` ADD COLUMN `to_user_name` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '小程序的原始 ID' AFTER `id`; + + + +# 15:25 2021/9/27 +ALTER TABLE `agent_product_specs` + DROP INDEX `product_id`, + ADD INDEX `agent_product_id_deleted_at` (`agent_product_id`, `deleted_at`); +ALTER TABLE `product_specs` + DROP INDEX `product_id`, + ADD INDEX `product_id_deleted_at` (`product_id`, `deleted_at`); + +# 17:36 2021/9/27 +ALTER TABLE `products` + ADD COLUMN `diy_form_id` INT NOT NULL DEFAULT 0 COMMENT '信息收集表单ID' AFTER `extends`; diff --git a/app/AdminSupplier/Controllers/DiyFormController.php b/app/AdminSupplier/Controllers/DiyFormController.php new file mode 100644 index 0000000..bc61c05 --- /dev/null +++ b/app/AdminSupplier/Controllers/DiyFormController.php @@ -0,0 +1,128 @@ + '单行文本框', + 'textarea' => '多行文本框', + 'select' => '选择框', + 'checkbox' => '多选框', + 'image' => '图片上传', + ]; + + /** + * Make a grid builder. + * + * @return Grid + */ + protected function grid() + { + return Grid::make(new DiyForm(['fields']), function (Grid $grid) { + $grid->disableViewButton(); + + $grid->model()->where('supplier_id', Admin::user()->id); + + $grid->column('id')->sortable(); + $grid->column('name'); + + $field_types = $this->field_types; + $grid->column('fields') + ->display('查看') + ->modal('字段列表', function ($modal) use ($field_types) { + $fields = array_map(function ($v) use ($field_types) { + return [ + $v['field'], + $field_types[$v['type']] ?? '', + $v['required'] ? '必填' : '选填', + $v['sort'], + ]; + }, $this->fields->toArray()); + return Table::make(['字段名', '字段类型', '是否必填', '排序'], $fields); + }); + $grid->column('created_at'); + + $grid->filter(function (Grid\Filter $filter) { + $filter->equal('id')->width(2); + $filter->like('name')->width(3); + }); + }); + } + + /** + * Make a show builder. + * + * @param mixed $id + * + * @return Show + */ + protected function detail($id) + { + return Show::make($id, new DiyForm(['fields']), function (Show $show) { + //不允许查看非自己的数据 + if ($show->model()->supplier_id != Admin::user()->id) { + Admin::exit('数据不存在'); + } + + $show->field('id'); + $show->field('name'); + $show->field('fields'); + $show->field('created_at'); + $show->field('updated_at'); + }); + } + + /** + * Make a form builder. + * + * @return Form + */ + protected function form() + { + return Form::make(new DiyForm(['fields']), function (Form $form) { + $form->disableViewButton(); + + //不允许编辑非自己数据 + if ($form->isEditing() && $form->model()->supplier_id != Admin::user()->id) { + return $form->response()->error('数据不存在'); + } + + $form->display('id'); + $form->text('name')->required(); + $form->hasMany('fields', function (Form\NestedForm $form) { + $form->text('field', '字段名称')->required(); + $form->switch('required', '是否必填')->value(1)->default(1)->required(); + $form->radio('type', '字段类型') + ->required()->default('text')->value('text') + ->options($this->field_types)->when(['select', 'checkbox'], function (Form\NestedForm $form) { + $form->list('options', '选项列表'); + }); + $form->number('sort', '排序') + ->help('数字越小越靠前')->value(255) + ->default(255)->required(); + }); + })->saving(function (Form $form) { + //不允许编辑非自己数据 + if ($form->isEditing() && $form->model()->supplier_id != Admin::user()->id) { + return $form->response()->error('数据不存在'); + } + + $form->hidden(['supplier_id']); + $form->supplier_id = Admin::user()->id; + })->deleting(function (Form $form) { + //不允许删除非自己的数据 + if (array_filter($form->model()->toArray(), fn($v) => $v['supplier_id'] != Admin::user()->id)) { + return $form->response()->error('数据不存在'); + } + }); + } +} diff --git a/app/AdminSupplier/Controllers/ProductController.php b/app/AdminSupplier/Controllers/ProductController.php index 9aae812..17b7378 100644 --- a/app/AdminSupplier/Controllers/ProductController.php +++ b/app/AdminSupplier/Controllers/ProductController.php @@ -7,6 +7,7 @@ use App\Common\ProductStatus; use App\Models\AgentProduct; use App\Models\AgentProductItem; use App\Models\Category; +use App\Models\DiyForm; use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Form\NestedForm; @@ -137,6 +138,10 @@ class ProductController extends AdminController $form->editor('content')->required(); $form->mobile('verify_mobile')->required(); + //信息收集表单 + $options = DiyForm::where('supplier_id', 2)->pluck('name', 'id'); + $form->select('diy_form_id', '信息收集表单')->options($options); + //扩展字段 $publish_type = array_intersect_key( admin_trans('product.options.publish_type'), diff --git a/app/AdminSupplier/Repositories/DiyForm.php b/app/AdminSupplier/Repositories/DiyForm.php new file mode 100644 index 0000000..492a368 --- /dev/null +++ b/app/AdminSupplier/Repositories/DiyForm.php @@ -0,0 +1,16 @@ +resource('order/list', 'OrderController'); $router->resource('agent/list', 'AgentController'); $router->resource('supplier_info', 'SupplierInfoController'); + $router->resource('diy_form', 'DiyFormController'); $router->resource('demand', 'DemandController'); $router->resource('demand_bidding', 'DemandBiddingController'); diff --git a/app/Http/Controllers/Api/AgentProductController.php b/app/Http/Controllers/Api/AgentProductController.php index d2e70f9..3873eee 100644 --- a/app/Http/Controllers/Api/AgentProductController.php +++ b/app/Http/Controllers/Api/AgentProductController.php @@ -65,7 +65,11 @@ class AgentProductController extends Controller } $agent_product = AgentProduct::with([ 'coupon:tag,agent_product_id', - 'product:id,type,extends', + 'product' => function ($query) { + $query->select(['id', 'type', 'extends', 'diy_form_id'])->with('diyForm', function ($query) { + $query->select(['id', 'name'])->with('fields'); + }); + }, 'spec' => function($query) { return $query->has('productSpec')->with('productSpec', function ($query) { $query->select(['id', 'name', 'date'])->where('date', '>=', date('Y-m-d'))->orderBy('date', 'asc'); diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php index 7edc61b..8dc3a80 100644 --- a/app/Http/Controllers/Api/OrderController.php +++ b/app/Http/Controllers/Api/OrderController.php @@ -124,7 +124,7 @@ class OrderController extends Controller 'pay_type' => ['required', 'in:' . $pay_type_values], 'num' => ['required', 'min:1'], 'spec_id' => ['required', 'array'], - 'id_card' => ['regex:/^\d{17}[\dXx]$/'], + 'info' => ['array'], ], [ 'id.required' => '未指定产品ID', 'name.required' => '请输入联系人姓名', @@ -138,7 +138,7 @@ class OrderController extends Controller 'num.min' => '购买数量输入错误', 'spec_id.required' => '请选择产品规格', 'spec_id.array' => '产品规格必须是数组', - 'id_card.regex' => '身份证号输入不正确', + 'info.array' => '订单信息必须是数组', ]); $ap = AgentProduct::with(['coupon', 'product', 'agentCloudProduct:id,price']) @@ -154,7 +154,7 @@ class OrderController extends Controller return $this->error('产品已下架或库存不足'); } - $order_info = []; + $order_info = $formData['info']; //0:单品销售；1:组合销售 if ($ap->type == 0) { @@ -190,17 +190,7 @@ class OrderController extends Controller if (empty($formData['departure_time']) || !strtotime($formData['departure_time'])) { return $this->error('请选择出发时间'); } - /*if (empty($formData['return_time']) || !strtotime($formData['return_time'])) { - return $this->error('请选择回程时间'); - }*/ - if (empty($formData['id_card'])) { - return $this->error('请输入身份证号'); - } - $order_info['departure_time'] = $formData['departure_time']; //出发时间 -// $order_info['return_time'] = $formData['return_time']; //回程时间 - $order_info['id_card'] = $formData['id_card']; //身份证号 - $order_info['sex'] = $formData['sex'] ?? 0; //性别 - $order_info['age'] = $formData['age'] ?? 0; //年龄 + $order_info['出发时间'] = $formData['departure_time']; //出发时间 break; case 1: if (empty($formData['check_in_time']) || !strtotime($formData['check_in_time'])) { @@ -212,15 +202,9 @@ class OrderController extends Controller if (empty($formData['arrival_time']) || !strtotime($formData['arrival_time'])) { return $this->error('请选择到店时间'); } - if (empty($formData['id_card'])) { - return $this->error('请输入身份证号'); - } - $order_info['check_in_time'] = $formData['check_in_time']; //入住时间 - $order_info['check_out_time'] = $formData['check_out_time']; //离店时间 - $order_info['arrival_time'] = $formData['arrival_time']; //到店时间 - $order_info['id_card'] = $formData['id_card']; //身份证号 - $order_info['sex'] = $formData['sex'] ?? 0; //性别 - $order_info['age'] = $formData['age'] ?? 0; //年龄 + $order_info['入住时间'] = $formData['check_in_time']; //入住时间 + $order_info['离店时间'] = $formData['check_out_time']; //离店时间 + $order_info['到店时间'] = $formData['arrival_time']; //到店时间 break; } } else { diff --git a/app/Models/DiyForm.php b/app/Models/DiyForm.php new file mode 100644 index 0000000..ccd870b --- /dev/null +++ b/app/Models/DiyForm.php @@ -0,0 +1,18 @@ +hasMany(DiyFormField::class)->orderBy('sort'); + } +} diff --git a/app/Models/DiyFormField.php b/app/Models/DiyFormField.php new file mode 100644 index 0000000..6442007 --- /dev/null +++ b/app/Models/DiyFormField.php @@ -0,0 +1,25 @@ + 'json']; + protected $guarded = ['id']; + + public function __construct(array $attributes = []) + { + parent::__construct($attributes); + $this->timestamps = false; + } + + public function form() + { + return $this->belongsTo(DiyForm::class); + } +} diff --git a/app/Models/Product.php b/app/Models/Product.php index 4cc4d88..e9ca82e 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -54,4 +54,9 @@ class Product extends BaseModel { return $this->hasMany(ProductSpec::class); } + + public function diyForm() + { + return $this->belongsTo(DiyForm::class); + } } diff --git a/dcat_admin_ide_helper.php b/dcat_admin_ide_helper.php index 9190e4f..39ff31c 100644 --- a/dcat_admin_ide_helper.php +++ b/dcat_admin_ide_helper.php @@ -12,12 +12,19 @@ namespace Dcat\Admin { /** * @property Grid\Column|Collection disable + * @property Grid\Column|Collection agent_id * @property Grid\Column|Collection created_at - * @property Grid\Column|Collection detail + * @property Grid\Column|Collection desc * @property Grid\Column|Collection id * @property Grid\Column|Collection name - * @property Grid\Column|Collection type + * @property Grid\Column|Collection picture + * @property Grid\Column|Collection tag * @property Grid\Column|Collection updated_at + * @property Grid\Column|Collection content + * @property Grid\Column|Collection know + * @property Grid\Column|Collection product_id + * @property Grid\Column|Collection detail + * @property Grid\Column|Collection type * @property Grid\Column|Collection version * @property Grid\Column|Collection is_enabled * @property Grid\Column|Collection extension @@ -37,9 +44,7 @@ namespace Dcat\Admin { * @property Grid\Column|Collection password * @property Grid\Column|Collection remember_token * @property Grid\Column|Collection username - * @property Grid\Column|Collection agent_id * @property Grid\Column|Collection display - * @property Grid\Column|Collection picture * @property Grid\Column|Collection sort * @property Grid\Column|Collection status * @property Grid\Column|Collection url @@ -47,13 +52,15 @@ namespace Dcat\Admin { * @property Grid\Column|Collection buy_protocol * @property Grid\Column|Collection reg_protocol * @property Grid\Column|Collection agent_product_id - * @property Grid\Column|Collection product_id * @property Grid\Column|Collection supplier_id + * @property Grid\Column|Collection deleted_at + * @property Grid\Column|Collection original_price + * @property Grid\Column|Collection price + * @property Grid\Column|Collection product_spec_id + * @property Grid\Column|Collection stock * @property Grid\Column|Collection agent_cloud_pid * @property Grid\Column|Collection category_id * @property Grid\Column|Collection channel_id - * @property Grid\Column|Collection content - * @property Grid\Column|Collection deleted_at * @property Grid\Column|Collection deposit * @property Grid\Column|Collection deposit_timeout * @property Grid\Column|Collection earnest @@ -62,13 +69,9 @@ namespace Dcat\Admin { * @property Grid\Column|Collection guide_price * @property Grid\Column|Collection is_cloud * @property Grid\Column|Collection is_rec - * @property Grid\Column|Collection know - * @property Grid\Column|Collection original_price * @property Grid\Column|Collection pictures - * @property Grid\Column|Collection price * @property Grid\Column|Collection product_ids * @property Grid\Column|Collection sale - * @property Grid\Column|Collection stock * @property Grid\Column|Collection verifier * @property Grid\Column|Collection setting * @property Grid\Column|Collection address @@ -89,15 +92,17 @@ namespace Dcat\Admin { * @property Grid\Column|Collection mchkey * @property Grid\Column|Collection province_id * @property Grid\Column|Collection rate + * @property Grid\Column|Collection code + * @property Grid\Column|Collection pid * @property Grid\Column|Collection agent_product_ids * @property Grid\Column|Collection author * @property Grid\Column|Collection image - * @property Grid\Column|Collection response - * @property Grid\Column|Collection pid * @property Grid\Column|Collection template + * @property Grid\Column|Collection level + * @property Grid\Column|Collection parent_code + * @property Grid\Column|Collection sulg * @property Grid\Column|Collection end_at * @property Grid\Column|Collection start_at - * @property Grid\Column|Collection tag * @property Grid\Column|Collection bidding_id * @property Grid\Column|Collection bidding_user_id * @property Grid\Column|Collection bidding_user_type @@ -128,6 +133,7 @@ namespace Dcat\Admin { * @property Grid\Column|Collection verify_code * @property Grid\Column|Collection min_sale * @property Grid\Column|Collection verify_mobile + * @property Grid\Column|Collection category_list * @property Grid\Column|Collection create_time * @property Grid\Column|Collection developer * @property Grid\Column|Collection draft_id @@ -137,13 +143,18 @@ namespace Dcat\Admin { * @property Grid\Column|Collection user_desc * @property Grid\Column|Collection user_version * @property Grid\Column|Collection event + * @property Grid\Column|Collection response + * @property Grid\Column|Collection audit_scene + * @property Grid\Column|Collection audit_status * @property Grid\Column|Collection template_id * @property Grid\Column|Collection template_type * @property Grid\Column|Collection audit_id * @property Grid\Column|Collection is_success * @property Grid\Column|Collection qrcode + * @property Grid\Column|Collection to_user_name + * @property Grid\Column|Collection agent_product_spec_id * @property Grid\Column|Collection order_id - * @property Grid\Column|Collection product_spec_id + * @property Grid\Column|Collection product_type * @property Grid\Column|Collection agent_cloud_price * @property Grid\Column|Collection coupon_id * @property Grid\Column|Collection info @@ -155,6 +166,7 @@ namespace Dcat\Admin { * @property Grid\Column|Collection single_price * @property Grid\Column|Collection email * @property Grid\Column|Collection token + * @property Grid\Column|Collection date * @property Grid\Column|Collection access_id * @property Grid\Column|Collection access_type * @property Grid\Column|Collection user_type @@ -167,7 +179,6 @@ namespace Dcat\Admin { * @property Grid\Column|Collection descr * @property Grid\Column|Collection key * @property Grid\Column|Collection channels - * @property Grid\Column|Collection desc * @property Grid\Column|Collection money * @property Grid\Column|Collection out_trade_no * @property Grid\Column|Collection transaction_id @@ -194,12 +205,19 @@ namespace Dcat\Admin { * @property Grid\Column|Collection workorder_id * * @method Grid\Column|Collection disable(string $label = null) + * @method Grid\Column|Collection agent_id(string $label = null) * @method Grid\Column|Collection created_at(string $label = null) - * @method Grid\Column|Collection detail(string $label = null) + * @method Grid\Column|Collection desc(string $label = null) * @method Grid\Column|Collection id(string $label = null) * @method Grid\Column|Collection name(string $label = null) - * @method Grid\Column|Collection type(string $label = null) + * @method Grid\Column|Collection picture(string $label = null) + * @method Grid\Column|Collection tag(string $label = null) * @method Grid\Column|Collection updated_at(string $label = null) + * @method Grid\Column|Collection content(string $label = null) + * @method Grid\Column|Collection know(string $label = null) + * @method Grid\Column|Collection product_id(string $label = null) + * @method Grid\Column|Collection detail(string $label = null) + * @method Grid\Column|Collection type(string $label = null) * @method Grid\Column|Collection version(string $label = null) * @method Grid\Column|Collection is_enabled(string $label = null) * @method Grid\Column|Collection extension(string $label = null) @@ -219,9 +237,7 @@ namespace Dcat\Admin { * @method Grid\Column|Collection password(string $label = null) * @method Grid\Column|Collection remember_token(string $label = null) * @method Grid\Column|Collection username(string $label = null) - * @method Grid\Column|Collection agent_id(string $label = null) * @method Grid\Column|Collection display(string $label = null) - * @method Grid\Column|Collection picture(string $label = null) * @method Grid\Column|Collection sort(string $label = null) * @method Grid\Column|Collection status(string $label = null) * @method Grid\Column|Collection url(string $label = null) @@ -229,13 +245,15 @@ namespace Dcat\Admin { * @method Grid\Column|Collection buy_protocol(string $label = null) * @method Grid\Column|Collection reg_protocol(string $label = null) * @method Grid\Column|Collection agent_product_id(string $label = null) - * @method Grid\Column|Collection product_id(string $label = null) * @method Grid\Column|Collection supplier_id(string $label = null) + * @method Grid\Column|Collection deleted_at(string $label = null) + * @method Grid\Column|Collection original_price(string $label = null) + * @method Grid\Column|Collection price(string $label = null) + * @method Grid\Column|Collection product_spec_id(string $label = null) + * @method Grid\Column|Collection stock(string $label = null) * @method Grid\Column|Collection agent_cloud_pid(string $label = null) * @method Grid\Column|Collection category_id(string $label = null) * @method Grid\Column|Collection channel_id(string $label = null) - * @method Grid\Column|Collection content(string $label = null) - * @method Grid\Column|Collection deleted_at(string $label = null) * @method Grid\Column|Collection deposit(string $label = null) * @method Grid\Column|Collection deposit_timeout(string $label = null) * @method Grid\Column|Collection earnest(string $label = null) @@ -244,13 +262,9 @@ namespace Dcat\Admin { * @method Grid\Column|Collection guide_price(string $label = null) * @method Grid\Column|Collection is_cloud(string $label = null) * @method Grid\Column|Collection is_rec(string $label = null) - * @method Grid\Column|Collection know(string $label = null) - * @method Grid\Column|Collection original_price(string $label = null) * @method Grid\Column|Collection pictures(string $label = null) - * @method Grid\Column|Collection price(string $label = null) * @method Grid\Column|Collection product_ids(string $label = null) * @method Grid\Column|Collection sale(string $label = null) - * @method Grid\Column|Collection stock(string $label = null) * @method Grid\Column|Collection verifier(string $label = null) * @method Grid\Column|Collection setting(string $label = null) * @method Grid\Column|Collection address(string $label = null) @@ -271,15 +285,17 @@ namespace Dcat\Admin { * @method Grid\Column|Collection mchkey(string $label = null) * @method Grid\Column|Collection province_id(string $label = null) * @method Grid\Column|Collection rate(string $label = null) + * @method Grid\Column|Collection code(string $label = null) + * @method Grid\Column|Collection pid(string $label = null) * @method Grid\Column|Collection agent_product_ids(string $label = null) * @method Grid\Column|Collection author(string $label = null) * @method Grid\Column|Collection image(string $label = null) - * @method Grid\Column|Collection response(string $label = null) - * @method Grid\Column|Collection pid(string $label = null) * @method Grid\Column|Collection template(string $label = null) + * @method Grid\Column|Collection level(string $label = null) + * @method Grid\Column|Collection parent_code(string $label = null) + * @method Grid\Column|Collection sulg(string $label = null) * @method Grid\Column|Collection end_at(string $label = null) * @method Grid\Column|Collection start_at(string $label = null) - * @method Grid\Column|Collection tag(string $label = null) * @method Grid\Column|Collection bidding_id(string $label = null) * @method Grid\Column|Collection bidding_user_id(string $label = null) * @method Grid\Column|Collection bidding_user_type(string $label = null) @@ -310,6 +326,7 @@ namespace Dcat\Admin { * @method Grid\Column|Collection verify_code(string $label = null) * @method Grid\Column|Collection min_sale(string $label = null) * @method Grid\Column|Collection verify_mobile(string $label = null) + * @method Grid\Column|Collection category_list(string $label = null) * @method Grid\Column|Collection create_time(string $label = null) * @method Grid\Column|Collection developer(string $label = null) * @method Grid\Column|Collection draft_id(string $label = null) @@ -319,13 +336,18 @@ namespace Dcat\Admin { * @method Grid\Column|Collection user_desc(string $label = null) * @method Grid\Column|Collection user_version(string $label = null) * @method Grid\Column|Collection event(string $label = null) + * @method Grid\Column|Collection response(string $label = null) + * @method Grid\Column|Collection audit_scene(string $label = null) + * @method Grid\Column|Collection audit_status(string $label = null) * @method Grid\Column|Collection template_id(string $label = null) * @method Grid\Column|Collection template_type(string $label = null) * @method Grid\Column|Collection audit_id(string $label = null) * @method Grid\Column|Collection is_success(string $label = null) * @method Grid\Column|Collection qrcode(string $label = null) + * @method Grid\Column|Collection to_user_name(string $label = null) + * @method Grid\Column|Collection agent_product_spec_id(string $label = null) * @method Grid\Column|Collection order_id(string $label = null) - * @method Grid\Column|Collection product_spec_id(string $label = null) + * @method Grid\Column|Collection product_type(string $label = null) * @method Grid\Column|Collection agent_cloud_price(string $label = null) * @method Grid\Column|Collection coupon_id(string $label = null) * @method Grid\Column|Collection info(string $label = null) @@ -337,6 +359,7 @@ namespace Dcat\Admin { * @method Grid\Column|Collection single_price(string $label = null) * @method Grid\Column|Collection email(string $label = null) * @method Grid\Column|Collection token(string $label = null) + * @method Grid\Column|Collection date(string $label = null) * @method Grid\Column|Collection access_id(string $label = null) * @method Grid\Column|Collection access_type(string $label = null) * @method Grid\Column|Collection user_type(string $label = null) @@ -349,7 +372,6 @@ namespace Dcat\Admin { * @method Grid\Column|Collection descr(string $label = null) * @method Grid\Column|Collection key(string $label = null) * @method Grid\Column|Collection channels(string $label = null) - * @method Grid\Column|Collection desc(string $label = null) * @method Grid\Column|Collection money(string $label = null) * @method Grid\Column|Collection out_trade_no(string $label = null) * @method Grid\Column|Collection transaction_id(string $label = null) @@ -381,12 +403,19 @@ namespace Dcat\Admin { /** * @property Show\Field|Collection disable + * @property Show\Field|Collection agent_id * @property Show\Field|Collection created_at - * @property Show\Field|Collection detail + * @property Show\Field|Collection desc * @property Show\Field|Collection id * @property Show\Field|Collection name - * @property Show\Field|Collection type + * @property Show\Field|Collection picture + * @property Show\Field|Collection tag * @property Show\Field|Collection updated_at + * @property Show\Field|Collection content + * @property Show\Field|Collection know + * @property Show\Field|Collection product_id + * @property Show\Field|Collection detail + * @property Show\Field|Collection type * @property Show\Field|Collection version * @property Show\Field|Collection is_enabled * @property Show\Field|Collection extension @@ -406,9 +435,7 @@ namespace Dcat\Admin { * @property Show\Field|Collection password * @property Show\Field|Collection remember_token * @property Show\Field|Collection username - * @property Show\Field|Collection agent_id * @property Show\Field|Collection display - * @property Show\Field|Collection picture * @property Show\Field|Collection sort * @property Show\Field|Collection status * @property Show\Field|Collection url @@ -416,13 +443,15 @@ namespace Dcat\Admin { * @property Show\Field|Collection buy_protocol * @property Show\Field|Collection reg_protocol * @property Show\Field|Collection agent_product_id - * @property Show\Field|Collection product_id * @property Show\Field|Collection supplier_id + * @property Show\Field|Collection deleted_at + * @property Show\Field|Collection original_price + * @property Show\Field|Collection price + * @property Show\Field|Collection product_spec_id + * @property Show\Field|Collection stock * @property Show\Field|Collection agent_cloud_pid * @property Show\Field|Collection category_id * @property Show\Field|Collection channel_id - * @property Show\Field|Collection content - * @property Show\Field|Collection deleted_at * @property Show\Field|Collection deposit * @property Show\Field|Collection deposit_timeout * @property Show\Field|Collection earnest @@ -431,13 +460,9 @@ namespace Dcat\Admin { * @property Show\Field|Collection guide_price * @property Show\Field|Collection is_cloud * @property Show\Field|Collection is_rec - * @property Show\Field|Collection know - * @property Show\Field|Collection original_price * @property Show\Field|Collection pictures - * @property Show\Field|Collection price * @property Show\Field|Collection product_ids * @property Show\Field|Collection sale - * @property Show\Field|Collection stock * @property Show\Field|Collection verifier * @property Show\Field|Collection setting * @property Show\Field|Collection address @@ -458,15 +483,17 @@ namespace Dcat\Admin { * @property Show\Field|Collection mchkey * @property Show\Field|Collection province_id * @property Show\Field|Collection rate + * @property Show\Field|Collection code + * @property Show\Field|Collection pid * @property Show\Field|Collection agent_product_ids * @property Show\Field|Collection author * @property Show\Field|Collection image - * @property Show\Field|Collection response - * @property Show\Field|Collection pid * @property Show\Field|Collection template + * @property Show\Field|Collection level + * @property Show\Field|Collection parent_code + * @property Show\Field|Collection sulg * @property Show\Field|Collection end_at * @property Show\Field|Collection start_at - * @property Show\Field|Collection tag * @property Show\Field|Collection bidding_id * @property Show\Field|Collection bidding_user_id * @property Show\Field|Collection bidding_user_type @@ -497,6 +524,7 @@ namespace Dcat\Admin { * @property Show\Field|Collection verify_code * @property Show\Field|Collection min_sale * @property Show\Field|Collection verify_mobile + * @property Show\Field|Collection category_list * @property Show\Field|Collection create_time * @property Show\Field|Collection developer * @property Show\Field|Collection draft_id @@ -506,13 +534,18 @@ namespace Dcat\Admin { * @property Show\Field|Collection user_desc * @property Show\Field|Collection user_version * @property Show\Field|Collection event + * @property Show\Field|Collection response + * @property Show\Field|Collection audit_scene + * @property Show\Field|Collection audit_status * @property Show\Field|Collection template_id * @property Show\Field|Collection template_type * @property Show\Field|Collection audit_id * @property Show\Field|Collection is_success * @property Show\Field|Collection qrcode + * @property Show\Field|Collection to_user_name + * @property Show\Field|Collection agent_product_spec_id * @property Show\Field|Collection order_id - * @property Show\Field|Collection product_spec_id + * @property Show\Field|Collection product_type * @property Show\Field|Collection agent_cloud_price * @property Show\Field|Collection coupon_id * @property Show\Field|Collection info @@ -524,6 +557,7 @@ namespace Dcat\Admin { * @property Show\Field|Collection single_price * @property Show\Field|Collection email * @property Show\Field|Collection token + * @property Show\Field|Collection date * @property Show\Field|Collection access_id * @property Show\Field|Collection access_type * @property Show\Field|Collection user_type @@ -536,7 +570,6 @@ namespace Dcat\Admin { * @property Show\Field|Collection descr * @property Show\Field|Collection key * @property Show\Field|Collection channels - * @property Show\Field|Collection desc * @property Show\Field|Collection money * @property Show\Field|Collection out_trade_no * @property Show\Field|Collection transaction_id @@ -563,12 +596,19 @@ namespace Dcat\Admin { * @property Show\Field|Collection workorder_id * * @method Show\Field|Collection disable(string $label = null) + * @method Show\Field|Collection agent_id(string $label = null) * @method Show\Field|Collection created_at(string $label = null) - * @method Show\Field|Collection detail(string $label = null) + * @method Show\Field|Collection desc(string $label = null) * @method Show\Field|Collection id(string $label = null) * @method Show\Field|Collection name(string $label = null) - * @method Show\Field|Collection type(string $label = null) + * @method Show\Field|Collection picture(string $label = null) + * @method Show\Field|Collection tag(string $label = null) * @method Show\Field|Collection updated_at(string $label = null) + * @method Show\Field|Collection content(string $label = null) + * @method Show\Field|Collection know(string $label = null) + * @method Show\Field|Collection product_id(string $label = null) + * @method Show\Field|Collection detail(string $label = null) + * @method Show\Field|Collection type(string $label = null) * @method Show\Field|Collection version(string $label = null) * @method Show\Field|Collection is_enabled(string $label = null) * @method Show\Field|Collection extension(string $label = null) @@ -588,9 +628,7 @@ namespace Dcat\Admin { * @method Show\Field|Collection password(string $label = null) * @method Show\Field|Collection remember_token(string $label = null) * @method Show\Field|Collection username(string $label = null) - * @method Show\Field|Collection agent_id(string $label = null) * @method Show\Field|Collection display(string $label = null) - * @method Show\Field|Collection picture(string $label = null) * @method Show\Field|Collection sort(string $label = null) * @method Show\Field|Collection status(string $label = null) * @method Show\Field|Collection url(string $label = null) @@ -598,13 +636,15 @@ namespace Dcat\Admin { * @method Show\Field|Collection buy_protocol(string $label = null) * @method Show\Field|Collection reg_protocol(string $label = null) * @method Show\Field|Collection agent_product_id(string $label = null) - * @method Show\Field|Collection product_id(string $label = null) * @method Show\Field|Collection supplier_id(string $label = null) + * @method Show\Field|Collection deleted_at(string $label = null) + * @method Show\Field|Collection original_price(string $label = null) + * @method Show\Field|Collection price(string $label = null) + * @method Show\Field|Collection product_spec_id(string $label = null) + * @method Show\Field|Collection stock(string $label = null) * @method Show\Field|Collection agent_cloud_pid(string $label = null) * @method Show\Field|Collection category_id(string $label = null) * @method Show\Field|Collection channel_id(string $label = null) - * @method Show\Field|Collection content(string $label = null) - * @method Show\Field|Collection deleted_at(string $label = null) * @method Show\Field|Collection deposit(string $label = null) * @method Show\Field|Collection deposit_timeout(string $label = null) * @method Show\Field|Collection earnest(string $label = null) @@ -613,13 +653,9 @@ namespace Dcat\Admin { * @method Show\Field|Collection guide_price(string $label = null) * @method Show\Field|Collection is_cloud(string $label = null) * @method Show\Field|Collection is_rec(string $label = null) - * @method Show\Field|Collection know(string $label = null) - * @method Show\Field|Collection original_price(string $label = null) * @method Show\Field|Collection pictures(string $label = null) - * @method Show\Field|Collection price(string $label = null) * @method Show\Field|Collection product_ids(string $label = null) * @method Show\Field|Collection sale(string $label = null) - * @method Show\Field|Collection stock(string $label = null) * @method Show\Field|Collection verifier(string $label = null) * @method Show\Field|Collection setting(string $label = null) * @method Show\Field|Collection address(string $label = null) @@ -640,15 +676,17 @@ namespace Dcat\Admin { * @method Show\Field|Collection mchkey(string $label = null) * @method Show\Field|Collection province_id(string $label = null) * @method Show\Field|Collection rate(string $label = null) + * @method Show\Field|Collection code(string $label = null) + * @method Show\Field|Collection pid(string $label = null) * @method Show\Field|Collection agent_product_ids(string $label = null) * @method Show\Field|Collection author(string $label = null) * @method Show\Field|Collection image(string $label = null) - * @method Show\Field|Collection response(string $label = null) - * @method Show\Field|Collection pid(string $label = null) * @method Show\Field|Collection template(string $label = null) + * @method Show\Field|Collection level(string $label = null) + * @method Show\Field|Collection parent_code(string $label = null) + * @method Show\Field|Collection sulg(string $label = null) * @method Show\Field|Collection end_at(string $label = null) * @method Show\Field|Collection start_at(string $label = null) - * @method Show\Field|Collection tag(string $label = null) * @method Show\Field|Collection bidding_id(string $label = null) * @method Show\Field|Collection bidding_user_id(string $label = null) * @method Show\Field|Collection bidding_user_type(string $label = null) @@ -679,6 +717,7 @@ namespace Dcat\Admin { * @method Show\Field|Collection verify_code(string $label = null) * @method Show\Field|Collection min_sale(string $label = null) * @method Show\Field|Collection verify_mobile(string $label = null) + * @method Show\Field|Collection category_list(string $label = null) * @method Show\Field|Collection create_time(string $label = null) * @method Show\Field|Collection developer(string $label = null) * @method Show\Field|Collection draft_id(string $label = null) @@ -688,13 +727,18 @@ namespace Dcat\Admin { * @method Show\Field|Collection user_desc(string $label = null) * @method Show\Field|Collection user_version(string $label = null) * @method Show\Field|Collection event(string $label = null) + * @method Show\Field|Collection response(string $label = null) + * @method Show\Field|Collection audit_scene(string $label = null) + * @method Show\Field|Collection audit_status(string $label = null) * @method Show\Field|Collection template_id(string $label = null) * @method Show\Field|Collection template_type(string $label = null) * @method Show\Field|Collection audit_id(string $label = null) * @method Show\Field|Collection is_success(string $label = null) * @method Show\Field|Collection qrcode(string $label = null) + * @method Show\Field|Collection to_user_name(string $label = null) + * @method Show\Field|Collection agent_product_spec_id(string $label = null) * @method Show\Field|Collection order_id(string $label = null) - * @method Show\Field|Collection product_spec_id(string $label = null) + * @method Show\Field|Collection product_type(string $label = null) * @method Show\Field|Collection agent_cloud_price(string $label = null) * @method Show\Field|Collection coupon_id(string $label = null) * @method Show\Field|Collection info(string $label = null) @@ -706,6 +750,7 @@ namespace Dcat\Admin { * @method Show\Field|Collection single_price(string $label = null) * @method Show\Field|Collection email(string $label = null) * @method Show\Field|Collection token(string $label = null) + * @method Show\Field|Collection date(string $label = null) * @method Show\Field|Collection access_id(string $label = null) * @method Show\Field|Collection access_type(string $label = null) * @method Show\Field|Collection user_type(string $label = null) @@ -718,7 +763,6 @@ namespace Dcat\Admin { * @method Show\Field|Collection descr(string $label = null) * @method Show\Field|Collection key(string $label = null) * @method Show\Field|Collection channels(string $label = null) - * @method Show\Field|Collection desc(string $label = null) * @method Show\Field|Collection money(string $label = null) * @method Show\Field|Collection out_trade_no(string $label = null) * @method Show\Field|Collection transaction_id(string $label = null) @@ -755,7 +799,7 @@ namespace Dcat\Admin { namespace Dcat\Admin\Grid { /** - + */ class Column {} @@ -767,7 +811,7 @@ namespace Dcat\Admin\Grid { namespace Dcat\Admin\Show { /** - + */ class Field {} } diff --git a/resources/lang/zh_CN/diy-form.php b/resources/lang/zh_CN/diy-form.php new file mode 100644 index 0000000..f654607 --- /dev/null +++ b/resources/lang/zh_CN/diy-form.php @@ -0,0 +1,15 @@ + [ + 'DiyForm' => '信息收集表单', + 'diy-form' => '信息收集表单', + 'diy_form' => '信息收集表单', + ], + 'fields' => [ + 'supplier_id' => '供应商ID', + 'name' => '表单名', + 'fields' => '字段列表', + ], + 'options' => [ + ], +];