diff --git a/app/Admin/Controllers/v3/StoreUserController.php b/app/Admin/Controllers/v3/StoreUserController.php new file mode 100644 index 0000000..4c23090 --- /dev/null +++ b/app/Admin/Controllers/v3/StoreUserController.php @@ -0,0 +1,108 @@ +column('id')->sortable(); + $grid->column('store_id')->display(function($storeId) use($storeList){ + return isset($storeList[$storeId])?$storeList[$storeId]:''; + }); + $grid->column('username'); + $grid->column('user_category')->display(function($userCategory) use($categoryList){ + return isset($categoryList[$userCategory])?$categoryList[$userCategory]:''; + }); + $grid->column('register_type')->display(function($registerType) use($typeList){ + return isset($typeList[$registerType])?$typeList[$registerType]:''; + }); + $grid->column('status'); + $grid->column('join_ip'); + $grid->column('last_visit_time'); + $grid->column('last_ip'); + + $grid->model()->orderBy('id', 'desc'); + // 每页10条 + $grid->paginate(10); + + $grid->filter(function (Grid\Filter $filter) use($categoryList){ + unset($categoryList[0]); + $filter->equal('id'); + $filter->equal('user_category')->select($categoryList); + }); + }); + } + + /** + * Make a show builder. + * + * @param mixed $id + * + * @return Show + */ + protected function detail($id) + { + return Show::make($id, new StoreUser(), function (Show $show) { + $show->field('id'); + $show->field('store_id'); + $show->field('username'); + $show->field('user_category'); + $show->field('register_type'); + $show->field('status'); + $show->field('join_ip'); + $show->field('last_visit_time'); + $show->field('last_ip'); + $show->field('created_at'); + $show->field('updated_at'); + }); + } + + /** + * Make a form builder. + * + * @return Form + */ + protected function form() + { + return Form::make(new StoreUser(), function (Form $form) { + // 店铺 + $storeList = StoreModel::getStoreArray(); + // 账号类型 + $categoryList = StoreUserModel::$_USER_CATEGORY; + unset($categoryList[0]); + + $form->display('id'); + $form->select('store_id')->options($storeList); + $form->text('username'); + + $form->password('password_'); + $form->password('password_confirm')->same('password'); + + $form->select('user_category')->options($categoryList); + $form->hidden('register_type')->default(5); + + }); + } +} diff --git a/app/Admin/Repositories/v3/StoreUser.php b/app/Admin/Repositories/v3/StoreUser.php new file mode 100644 index 0000000..4cddf8c --- /dev/null +++ b/app/Admin/Repositories/v3/StoreUser.php @@ -0,0 +1,16 @@ +resource('/store', 'v3\StoreController'); + $router->resource('/store_Users', 'v3\StoreUserController'); // 商品 $router->resource('/goods', 'v3\GoodsController'); $router->resource('/goods_activity', 'v3\GoodsActivityController'); diff --git a/app/Models/v3/StoreUser.php b/app/Models/v3/StoreUser.php new file mode 100644 index 0000000..2d2f9df --- /dev/null +++ b/app/Models/v3/StoreUser.php @@ -0,0 +1,40 @@ +'店员']; + public static $_REGISTER_TYPE = ['网站注册','QQ','微信','app','商户注册默认账号','后台添加商户账号']; + public static $_STATUS = ['禁用','审核中', '正常']; + + public function getUserCategoryTextAttribute($value) + { + $value = $value ? $value : $this->user_category; + return isset(self::$_USER_CATEGORY[$value]) ? self::$_USER_CATEGORY[$value] : ''; + } + public function getRegisterTypeTextAttribute($value) + { + $value = $value ? $value : $this->register_type; + return isset(self::$_REGISTER_TYPE[$value]) ? self::$_REGISTER_TYPE[$value] : ''; + } + public function getStatusTextAttribute($value) + { + $value = $value ? $value : $this->status; + return isset(self::$_STATUS[$value]) ? self::$_STATUS[$value] : ''; + } +} diff --git a/dcat_admin_ide_helper.php b/dcat_admin_ide_helper.php index 50bc1f7..ee2e53e 100644 --- a/dcat_admin_ide_helper.php +++ b/dcat_admin_ide_helper.php @@ -92,12 +92,14 @@ namespace Dcat\Admin { * @property Grid\Column|Collection price * @property Grid\Column|Collection category_id * @property Grid\Column|Collection goods_category_id + * @property Grid\Column|Collection content * @property Grid\Column|Collection on_sale * @property Grid\Column|Collection order_num * @property Grid\Column|Collection state * @property Grid\Column|Collection pay_time * @property Grid\Column|Collection time * @property Grid\Column|Collection head_url + * @property Grid\Column|Collection dm_state * @property Grid\Column|Collection parent_id * @property Grid\Column|Collection order * @property Grid\Column|Collection icon @@ -129,7 +131,6 @@ namespace Dcat\Admin { * @property Grid\Column|Collection token * @property Grid\Column|Collection admin_id * @property Grid\Column|Collection url - * @property Grid\Column|Collection content * @property Grid\Column|Collection useragent * @property Grid\Column|Collection pid * @property Grid\Column|Collection shortname @@ -484,7 +485,6 @@ namespace Dcat\Admin { * @property Grid\Column|Collection yhq_money2 * @property Grid\Column|Collection coupon_id2 * @property Grid\Column|Collection dn_state - * @property Grid\Column|Collection dm_state * @property Grid\Column|Collection yy_state * @property Grid\Column|Collection deposit * @property Grid\Column|Collection ship_id @@ -1320,12 +1320,14 @@ namespace Dcat\Admin { * @method Grid\Column|Collection price(string $label = null) * @method Grid\Column|Collection category_id(string $label = null) * @method Grid\Column|Collection goods_category_id(string $label = null) + * @method Grid\Column|Collection content(string $label = null) * @method Grid\Column|Collection on_sale(string $label = null) * @method Grid\Column|Collection order_num(string $label = null) * @method Grid\Column|Collection state(string $label = null) * @method Grid\Column|Collection pay_time(string $label = null) * @method Grid\Column|Collection time(string $label = null) * @method Grid\Column|Collection head_url(string $label = null) + * @method Grid\Column|Collection dm_state(string $label = null) * @method Grid\Column|Collection parent_id(string $label = null) * @method Grid\Column|Collection order(string $label = null) * @method Grid\Column|Collection icon(string $label = null) @@ -1357,7 +1359,6 @@ namespace Dcat\Admin { * @method Grid\Column|Collection token(string $label = null) * @method Grid\Column|Collection admin_id(string $label = null) * @method Grid\Column|Collection url(string $label = null) - * @method Grid\Column|Collection content(string $label = null) * @method Grid\Column|Collection useragent(string $label = null) * @method Grid\Column|Collection pid(string $label = null) * @method Grid\Column|Collection shortname(string $label = null) @@ -1712,7 +1713,6 @@ namespace Dcat\Admin { * @method Grid\Column|Collection yhq_money2(string $label = null) * @method Grid\Column|Collection coupon_id2(string $label = null) * @method Grid\Column|Collection dn_state(string $label = null) - * @method Grid\Column|Collection dm_state(string $label = null) * @method Grid\Column|Collection yy_state(string $label = null) * @method Grid\Column|Collection deposit(string $label = null) * @method Grid\Column|Collection ship_id(string $label = null) @@ -2553,12 +2553,14 @@ namespace Dcat\Admin { * @property Show\Field|Collection price * @property Show\Field|Collection category_id * @property Show\Field|Collection goods_category_id + * @property Show\Field|Collection content * @property Show\Field|Collection on_sale * @property Show\Field|Collection order_num * @property Show\Field|Collection state * @property Show\Field|Collection pay_time * @property Show\Field|Collection time * @property Show\Field|Collection head_url + * @property Show\Field|Collection dm_state * @property Show\Field|Collection parent_id * @property Show\Field|Collection order * @property Show\Field|Collection icon @@ -2590,7 +2592,6 @@ namespace Dcat\Admin { * @property Show\Field|Collection token * @property Show\Field|Collection admin_id * @property Show\Field|Collection url - * @property Show\Field|Collection content * @property Show\Field|Collection useragent * @property Show\Field|Collection pid * @property Show\Field|Collection shortname @@ -2945,7 +2946,6 @@ namespace Dcat\Admin { * @property Show\Field|Collection yhq_money2 * @property Show\Field|Collection coupon_id2 * @property Show\Field|Collection dn_state - * @property Show\Field|Collection dm_state * @property Show\Field|Collection yy_state * @property Show\Field|Collection deposit * @property Show\Field|Collection ship_id @@ -3781,12 +3781,14 @@ namespace Dcat\Admin { * @method Show\Field|Collection price(string $label = null) * @method Show\Field|Collection category_id(string $label = null) * @method Show\Field|Collection goods_category_id(string $label = null) + * @method Show\Field|Collection content(string $label = null) * @method Show\Field|Collection on_sale(string $label = null) * @method Show\Field|Collection order_num(string $label = null) * @method Show\Field|Collection state(string $label = null) * @method Show\Field|Collection pay_time(string $label = null) * @method Show\Field|Collection time(string $label = null) * @method Show\Field|Collection head_url(string $label = null) + * @method Show\Field|Collection dm_state(string $label = null) * @method Show\Field|Collection parent_id(string $label = null) * @method Show\Field|Collection order(string $label = null) * @method Show\Field|Collection icon(string $label = null) @@ -3818,7 +3820,6 @@ namespace Dcat\Admin { * @method Show\Field|Collection token(string $label = null) * @method Show\Field|Collection admin_id(string $label = null) * @method Show\Field|Collection url(string $label = null) - * @method Show\Field|Collection content(string $label = null) * @method Show\Field|Collection useragent(string $label = null) * @method Show\Field|Collection pid(string $label = null) * @method Show\Field|Collection shortname(string $label = null) @@ -4173,7 +4174,6 @@ namespace Dcat\Admin { * @method Show\Field|Collection yhq_money2(string $label = null) * @method Show\Field|Collection coupon_id2(string $label = null) * @method Show\Field|Collection dn_state(string $label = null) - * @method Show\Field|Collection dm_state(string $label = null) * @method Show\Field|Collection yy_state(string $label = null) * @method Show\Field|Collection deposit(string $label = null) * @method Show\Field|Collection ship_id(string $label = null) diff --git a/resources/lang/zh-CN/store-user.php b/resources/lang/zh-CN/store-user.php new file mode 100644 index 0000000..255664d --- /dev/null +++ b/resources/lang/zh-CN/store-user.php @@ -0,0 +1,20 @@ + [ + 'StoreUser' => '店铺账号', + 'StoreUser' => '店铺账号', + 'store_User' => '店铺账号', + ], + 'fields' => [ + 'store_id' => '商家id', + 'username' => '账号', + 'user_category' => '账号类型', + 'register_type' => '用户来源类型', + 'status' => '状态', + 'join_ip' => '注册IP', + 'last_visit_time' => '最后访问时间', + 'last_ip' => '最后访问IP', + ], + 'options' => [ + ], +];