小程序用户
This commit is contained in:
@@ -6,6 +6,7 @@ use Modules\Common\Providers\PaginationProvider;
|
|||||||
use Modules\SystemAgent\Providers\SystemAgentServiceProvider;
|
use Modules\SystemAgent\Providers\SystemAgentServiceProvider;
|
||||||
use Modules\SystemTool\Providers\SystemToolServiceProvider;
|
use Modules\SystemTool\Providers\SystemToolServiceProvider;
|
||||||
use Modules\SystemUser\Providers\SystemUserServiceProvider;
|
use Modules\SystemUser\Providers\SystemUserServiceProvider;
|
||||||
|
use Modules\Member\Providers\MemberServiceProvider;
|
||||||
|
|
||||||
return [
|
return [
|
||||||
AppServiceProvider::class,
|
AppServiceProvider::class,
|
||||||
@@ -14,4 +15,5 @@ return [
|
|||||||
SystemAgentServiceProvider::class,
|
SystemAgentServiceProvider::class,
|
||||||
SystemUserServiceProvider::class,
|
SystemUserServiceProvider::class,
|
||||||
SystemToolServiceProvider::class,
|
SystemToolServiceProvider::class,
|
||||||
|
MemberServiceProvider::class,
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -359,6 +359,41 @@ class SysUserSeeder extends Seeder
|
|||||||
]
|
]
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
'type' => 'menu',
|
||||||
|
'name' => '小程序用户',
|
||||||
|
'local' => 'menu.member',
|
||||||
|
'icon' => 'UserOutlined',
|
||||||
|
'key' => 'member',
|
||||||
|
'children' => [
|
||||||
|
[
|
||||||
|
'type' => 'route',
|
||||||
|
'name' => '用户列表',
|
||||||
|
'key' => 'member.user',
|
||||||
|
'path' => '/member/user',
|
||||||
|
'local' => 'menu.member.user',
|
||||||
|
'children' => [
|
||||||
|
['type' => 'rule', 'name' => '查询列表', 'key' => 'member.user.query'],
|
||||||
|
['type' => 'rule', 'name' => '新增用户', 'key' => 'member.user.create'],
|
||||||
|
['type' => 'rule', 'name' => '修改用户', 'key' => 'member.user.update'],
|
||||||
|
['type' => 'rule', 'name' => '删除用户', 'key' => 'member.user.delete'],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'type' => 'route',
|
||||||
|
'name' => '地址管理',
|
||||||
|
'key' => 'member.address',
|
||||||
|
'path' => '/member/address',
|
||||||
|
'local' => 'menu.member.address',
|
||||||
|
'children' => [
|
||||||
|
['type' => 'rule', 'name' => '查询列表', 'key' => 'member.address.query'],
|
||||||
|
['type' => 'rule', 'name' => '新增地址', 'key' => 'member.address.create'],
|
||||||
|
['type' => 'rule', 'name' => '修改地址', 'key' => 'member.address.update'],
|
||||||
|
['type' => 'rule', 'name' => '删除地址', 'key' => 'member.address.delete'],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
],
|
||||||
[
|
[
|
||||||
'type' => 'route',
|
'type' => 'route',
|
||||||
'name' => 'XinAdmin',
|
'name' => 'XinAdmin',
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Modules\Member\Http\Controllers;
|
||||||
|
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Modules\AnnoRoute\Attribute\DeleteRoute;
|
||||||
|
use Modules\AnnoRoute\Attribute\GetRoute;
|
||||||
|
use Modules\AnnoRoute\Attribute\PostRoute;
|
||||||
|
use Modules\AnnoRoute\Attribute\PutRoute;
|
||||||
|
use Modules\AnnoRoute\Attribute\RequestAttribute;
|
||||||
|
use Modules\Common\Http\Controllers\BaseController;
|
||||||
|
use Modules\Member\Http\Requests\MemberAddressFormRequest;
|
||||||
|
use Modules\Member\Models\UserAddressModel;
|
||||||
|
|
||||||
|
#[RequestAttribute('/member/address', 'member.address')]
|
||||||
|
class MemberAddressController extends BaseController
|
||||||
|
{
|
||||||
|
protected array $searchField = [
|
||||||
|
'is_default' => '=',
|
||||||
|
];
|
||||||
|
|
||||||
|
protected array $quickSearchField = ['name', 'mobile', 'detail'];
|
||||||
|
|
||||||
|
#[GetRoute(authorize: 'query')]
|
||||||
|
public function query(Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
$params = $request->all();
|
||||||
|
$pageSize = $params['pageSize'] ?? 10;
|
||||||
|
$query = UserAddressModel::with('user:id,username,nickname,mobile');
|
||||||
|
$data = $this->buildSearch($params, $query)
|
||||||
|
->paginate($pageSize)
|
||||||
|
->toArray();
|
||||||
|
return $this->success($data);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[PostRoute(authorize: 'create')]
|
||||||
|
public function create(MemberAddressFormRequest $request): JsonResponse
|
||||||
|
{
|
||||||
|
$validated = $request->validated();
|
||||||
|
UserAddressModel::create($validated);
|
||||||
|
return $this->success();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[PutRoute(
|
||||||
|
route: '/{id}',
|
||||||
|
authorize: 'update',
|
||||||
|
where: ['id' => '[0-9]+']
|
||||||
|
)]
|
||||||
|
public function update(int $id, MemberAddressFormRequest $request): JsonResponse
|
||||||
|
{
|
||||||
|
$validated = $request->validated();
|
||||||
|
$model = UserAddressModel::find($id);
|
||||||
|
if (empty($model)) {
|
||||||
|
return $this->error();
|
||||||
|
}
|
||||||
|
$model->update($validated);
|
||||||
|
return $this->success();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[DeleteRoute(
|
||||||
|
route: '/{id}',
|
||||||
|
authorize: 'delete',
|
||||||
|
where: ['id' => '[0-9]+']
|
||||||
|
)]
|
||||||
|
public function delete(int $id): JsonResponse
|
||||||
|
{
|
||||||
|
$model = UserAddressModel::find($id);
|
||||||
|
if (empty($model)) {
|
||||||
|
return $this->error('地址不存在');
|
||||||
|
}
|
||||||
|
$model->delete();
|
||||||
|
return $this->success();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Modules\Member\Http\Controllers;
|
||||||
|
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Support\Facades\Hash;
|
||||||
|
use Modules\AnnoRoute\Attribute\DeleteRoute;
|
||||||
|
use Modules\AnnoRoute\Attribute\GetRoute;
|
||||||
|
use Modules\AnnoRoute\Attribute\PostRoute;
|
||||||
|
use Modules\AnnoRoute\Attribute\PutRoute;
|
||||||
|
use Modules\AnnoRoute\Attribute\RequestAttribute;
|
||||||
|
use Modules\Common\Http\Controllers\BaseController;
|
||||||
|
use Modules\Member\Http\Requests\MemberUserFormRequest;
|
||||||
|
use Modules\Member\Models\MemberUserModel;
|
||||||
|
|
||||||
|
#[RequestAttribute('/member/user', 'member.user')]
|
||||||
|
class MemberUserController extends BaseController
|
||||||
|
{
|
||||||
|
protected array $searchField = [
|
||||||
|
'status' => '=',
|
||||||
|
'gender' => '=',
|
||||||
|
];
|
||||||
|
|
||||||
|
protected array $quickSearchField = ['username', 'nickname', 'mobile'];
|
||||||
|
|
||||||
|
#[GetRoute(authorize: 'query')]
|
||||||
|
public function query(Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
$params = $request->all();
|
||||||
|
$pageSize = $params['pageSize'] ?? 10;
|
||||||
|
$query = MemberUserModel::query();
|
||||||
|
$data = $this->buildSearch($params, $query)
|
||||||
|
->paginate($pageSize)
|
||||||
|
->toArray();
|
||||||
|
return $this->success($data);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[PostRoute(authorize: 'create')]
|
||||||
|
public function create(MemberUserFormRequest $request): JsonResponse
|
||||||
|
{
|
||||||
|
$validated = $request->validated();
|
||||||
|
$validated['password'] = Hash::make($validated['password']);
|
||||||
|
MemberUserModel::create($validated);
|
||||||
|
return $this->success();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[PutRoute(
|
||||||
|
route: '/{id}',
|
||||||
|
authorize: 'update',
|
||||||
|
where: ['id' => '[0-9]+']
|
||||||
|
)]
|
||||||
|
public function update(int $id, MemberUserFormRequest $request): JsonResponse
|
||||||
|
{
|
||||||
|
$validated = $request->validated();
|
||||||
|
$model = MemberUserModel::find($id);
|
||||||
|
if (empty($model)) {
|
||||||
|
return $this->error();
|
||||||
|
}
|
||||||
|
if (!empty($validated['password'])) {
|
||||||
|
$validated['password'] = Hash::make($validated['password']);
|
||||||
|
} else {
|
||||||
|
unset($validated['password']);
|
||||||
|
}
|
||||||
|
$model->update($validated);
|
||||||
|
return $this->success();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[DeleteRoute(
|
||||||
|
route: '/{id}',
|
||||||
|
authorize: 'delete',
|
||||||
|
where: ['id' => '[0-9]+']
|
||||||
|
)]
|
||||||
|
public function delete(int $id): JsonResponse
|
||||||
|
{
|
||||||
|
$user = MemberUserModel::find($id);
|
||||||
|
if (empty($user)) {
|
||||||
|
return $this->error('用户不存在');
|
||||||
|
}
|
||||||
|
$user->delete();
|
||||||
|
return $this->success();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Modules\Member\Http\Requests;
|
||||||
|
|
||||||
|
use Modules\Common\Http\Requests\BaseFormRequest;
|
||||||
|
|
||||||
|
class MemberAddressFormRequest extends BaseFormRequest
|
||||||
|
{
|
||||||
|
protected $stopOnFirstFailure = true;
|
||||||
|
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'user_id' => 'required|integer|exists:user,id',
|
||||||
|
'name' => 'required|max:30',
|
||||||
|
'mobile' => 'required|max:20',
|
||||||
|
'province' => 'required|max:30',
|
||||||
|
'city' => 'required|max:30',
|
||||||
|
'district' => 'required|max:30',
|
||||||
|
'detail' => 'required|max:255',
|
||||||
|
'is_default' => 'nullable|integer|in:0,1',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function messages(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'user_id.required' => '用户ID不能为空',
|
||||||
|
'user_id.exists' => '用户不存在',
|
||||||
|
'name.required' => '收货人不能为空',
|
||||||
|
'name.max' => '收货人名称不能超过30个字符',
|
||||||
|
'mobile.required' => '联系电话不能为空',
|
||||||
|
'mobile.max' => '联系电话不能超过20个字符',
|
||||||
|
'province.required' => '省份不能为空',
|
||||||
|
'city.required' => '城市不能为空',
|
||||||
|
'district.required' => '区县不能为空',
|
||||||
|
'detail.required' => '详细地址不能为空',
|
||||||
|
'is_default.in' => '默认地址格式错误',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Modules\Member\Http\Requests;
|
||||||
|
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
|
use Modules\Common\Http\Requests\BaseFormRequest;
|
||||||
|
|
||||||
|
class MemberUserFormRequest extends BaseFormRequest
|
||||||
|
{
|
||||||
|
protected $stopOnFirstFailure = true;
|
||||||
|
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
if (!$this->isUpdate()) {
|
||||||
|
return [
|
||||||
|
'username' => 'required|unique:user,username',
|
||||||
|
'password' => 'required|min:6',
|
||||||
|
'nickname' => 'nullable',
|
||||||
|
'email' => 'nullable|email',
|
||||||
|
'mobile' => 'nullable',
|
||||||
|
'gender' => 'nullable|integer|in:0,1,2',
|
||||||
|
'status' => 'nullable|integer|in:0,1',
|
||||||
|
'avatar' => 'nullable',
|
||||||
|
'birthday' => 'nullable|date',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
$id = $this->route('id');
|
||||||
|
return [
|
||||||
|
'username' => [
|
||||||
|
'required',
|
||||||
|
Rule::unique('user', 'username')->ignore($id),
|
||||||
|
],
|
||||||
|
'password' => 'nullable|min:6',
|
||||||
|
'nickname' => 'nullable',
|
||||||
|
'email' => [
|
||||||
|
'nullable',
|
||||||
|
'email',
|
||||||
|
],
|
||||||
|
'mobile' => 'nullable',
|
||||||
|
'gender' => 'nullable|integer|in:0,1,2',
|
||||||
|
'status' => 'nullable|integer|in:0,1',
|
||||||
|
'avatar' => 'nullable',
|
||||||
|
'birthday' => 'nullable|date',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function messages(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'username.required' => '用户名不能为空',
|
||||||
|
'username.unique' => '用户名已存在',
|
||||||
|
'password.required' => '密码不能为空',
|
||||||
|
'password.min' => '密码至少6位',
|
||||||
|
'email.email' => '邮箱格式错误',
|
||||||
|
'gender.in' => '性别格式错误',
|
||||||
|
'status.in' => '状态格式错误',
|
||||||
|
'birthday.date' => '生日格式错误',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Modules\Member\Models;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
class MemberUserModel extends Model
|
||||||
|
{
|
||||||
|
protected $table = 'user';
|
||||||
|
|
||||||
|
protected $primaryKey = 'id';
|
||||||
|
|
||||||
|
protected $fillable = [
|
||||||
|
'username',
|
||||||
|
'password',
|
||||||
|
'nickname',
|
||||||
|
'email',
|
||||||
|
'avatar',
|
||||||
|
'mobile',
|
||||||
|
'gender',
|
||||||
|
'birthday',
|
||||||
|
'balance',
|
||||||
|
'status',
|
||||||
|
'last_login_at',
|
||||||
|
'openid',
|
||||||
|
'unionid',
|
||||||
|
];
|
||||||
|
|
||||||
|
protected $hidden = [
|
||||||
|
'password',
|
||||||
|
'remember_token',
|
||||||
|
];
|
||||||
|
|
||||||
|
protected $casts = [
|
||||||
|
'email_verified_at' => 'datetime',
|
||||||
|
'last_login_at' => 'datetime',
|
||||||
|
'birthday' => 'date',
|
||||||
|
'gender' => 'integer',
|
||||||
|
'status' => 'integer',
|
||||||
|
'balance' => 'decimal:2',
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Modules\Member\Models;
|
||||||
|
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
|
||||||
|
class UserAddressModel extends Model
|
||||||
|
{
|
||||||
|
protected $table = 'user_addresses';
|
||||||
|
|
||||||
|
protected $fillable = [
|
||||||
|
'user_id',
|
||||||
|
'name',
|
||||||
|
'mobile',
|
||||||
|
'province',
|
||||||
|
'city',
|
||||||
|
'district',
|
||||||
|
'detail',
|
||||||
|
'is_default',
|
||||||
|
];
|
||||||
|
|
||||||
|
protected $casts = [
|
||||||
|
'is_default' => 'integer',
|
||||||
|
];
|
||||||
|
|
||||||
|
public function user(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(MemberUserModel::class, 'user_id', 'id');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Modules\Member\Providers;
|
||||||
|
|
||||||
|
use Illuminate\Support\ServiceProvider;
|
||||||
|
use Modules\AnnoRoute\AnnoRoute;
|
||||||
|
|
||||||
|
class MemberServiceProvider extends ServiceProvider
|
||||||
|
{
|
||||||
|
public function boot(AnnoRoute $annoRoute): void
|
||||||
|
{
|
||||||
|
$annoRoute->register(base_path('modules/Member/Http/Controllers'));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
import createAxios from '@/utils/request';
|
||||||
|
|
||||||
|
/** 获取小程序用户列表 */
|
||||||
|
export async function listMemberUser(params?: Record<string, unknown>) {
|
||||||
|
return createAxios({
|
||||||
|
url: '/member/user',
|
||||||
|
method: 'get',
|
||||||
|
params,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 创建小程序用户 */
|
||||||
|
export async function createMemberUser(data: Record<string, unknown>) {
|
||||||
|
return createAxios({
|
||||||
|
url: '/member/user',
|
||||||
|
method: 'post',
|
||||||
|
data,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 更新小程序用户 */
|
||||||
|
export async function updateMemberUser(id: number, data: Record<string, unknown>) {
|
||||||
|
return createAxios({
|
||||||
|
url: `/member/user/${id}`,
|
||||||
|
method: 'put',
|
||||||
|
data,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 删除小程序用户 */
|
||||||
|
export async function deleteMemberUser(id: number) {
|
||||||
|
return createAxios({
|
||||||
|
url: `/member/user/${id}`,
|
||||||
|
method: 'delete',
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
import createAxios from '@/utils/request';
|
||||||
|
|
||||||
|
/** 获取用户地址列表 */
|
||||||
|
export async function listUserAddress(params?: Record<string, unknown>) {
|
||||||
|
return createAxios({
|
||||||
|
url: '/member/address',
|
||||||
|
method: 'get',
|
||||||
|
params,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 创建用户地址 */
|
||||||
|
export async function createUserAddress(data: Record<string, unknown>) {
|
||||||
|
return createAxios({
|
||||||
|
url: '/member/address',
|
||||||
|
method: 'post',
|
||||||
|
data,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 更新用户地址 */
|
||||||
|
export async function updateUserAddress(id: number, data: Record<string, unknown>) {
|
||||||
|
return createAxios({
|
||||||
|
url: `/member/address/${id}`,
|
||||||
|
method: 'put',
|
||||||
|
data,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 删除用户地址 */
|
||||||
|
export async function deleteUserAddress(id: number) {
|
||||||
|
return createAxios({
|
||||||
|
url: `/member/address/${id}`,
|
||||||
|
method: 'delete',
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
export default interface IMemberUser {
|
||||||
|
id?: number;
|
||||||
|
username?: string;
|
||||||
|
nickname?: string;
|
||||||
|
email?: string;
|
||||||
|
avatar?: string;
|
||||||
|
mobile?: string;
|
||||||
|
gender?: number;
|
||||||
|
birthday?: string;
|
||||||
|
balance?: number;
|
||||||
|
status?: number;
|
||||||
|
last_login_at?: string;
|
||||||
|
openid?: string;
|
||||||
|
unionid?: string;
|
||||||
|
created_at?: string;
|
||||||
|
updated_at?: string;
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
export default interface IUserAddress {
|
||||||
|
id?: number;
|
||||||
|
user_id?: number;
|
||||||
|
name?: string;
|
||||||
|
mobile?: string;
|
||||||
|
province?: string;
|
||||||
|
city?: string;
|
||||||
|
district?: string;
|
||||||
|
detail?: string;
|
||||||
|
is_default?: number;
|
||||||
|
created_at?: string;
|
||||||
|
updated_at?: string;
|
||||||
|
user?: {
|
||||||
|
id: number;
|
||||||
|
username: string;
|
||||||
|
nickname: string;
|
||||||
|
mobile: string;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -21,6 +21,9 @@ import aiChat from "./ai/chat";
|
|||||||
import aiConversation from "./ai/conversation";
|
import aiConversation from "./ai/conversation";
|
||||||
import aiAgent from "./ai/agent";
|
import aiAgent from "./ai/agent";
|
||||||
|
|
||||||
|
import memberUser from "./member/user";
|
||||||
|
import memberAddress from "./member/address";
|
||||||
|
|
||||||
import userProfile from "./user/profile";
|
import userProfile from "./user/profile";
|
||||||
|
|
||||||
import xinForm from "./components/xin-form";
|
import xinForm from "./components/xin-form";
|
||||||
@@ -49,6 +52,8 @@ export default {
|
|||||||
...aiChat,
|
...aiChat,
|
||||||
...aiConversation,
|
...aiConversation,
|
||||||
...aiAgent,
|
...aiAgent,
|
||||||
|
...memberUser,
|
||||||
|
...memberAddress,
|
||||||
...userProfile,
|
...userProfile,
|
||||||
...xinForm,
|
...xinForm,
|
||||||
...xinTable,
|
...xinTable,
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
export default {
|
||||||
|
"member.address.page.title": "Address Management",
|
||||||
|
"member.address.page.description": "Manage shipping addresses for mini-program users",
|
||||||
|
"member.address.id": "Address ID",
|
||||||
|
"member.address.user_id": "User",
|
||||||
|
"member.address.user_id.required": "User ID is required",
|
||||||
|
"member.address.name": "Recipient",
|
||||||
|
"member.address.name.required": "Recipient is required",
|
||||||
|
"member.address.mobile": "Contact Phone",
|
||||||
|
"member.address.mobile.required": "Contact phone is required",
|
||||||
|
"member.address.province": "Province",
|
||||||
|
"member.address.province.required": "Province is required",
|
||||||
|
"member.address.city": "City",
|
||||||
|
"member.address.city.required": "City is required",
|
||||||
|
"member.address.district": "District",
|
||||||
|
"member.address.district.required": "District is required",
|
||||||
|
"member.address.detail": "Detail Address",
|
||||||
|
"member.address.detail.required": "Detail address is required",
|
||||||
|
"member.address.full_address": "Full Address",
|
||||||
|
"member.address.is_default": "Default",
|
||||||
|
"member.address.is_default.0": "No",
|
||||||
|
"member.address.is_default.1": "Yes",
|
||||||
|
"member.address.created_at": "Created At",
|
||||||
|
"member.address.updated_at": "Updated At",
|
||||||
|
};
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
export default {
|
||||||
|
"member.user.page.title": "User List",
|
||||||
|
"member.user.page.description": "Manage mini-program registered users, view user information and status",
|
||||||
|
"member.user.id": "User ID",
|
||||||
|
"member.user.avatar": "Avatar",
|
||||||
|
"member.user.username": "Username",
|
||||||
|
"member.user.username.required": "Username is required",
|
||||||
|
"member.user.nickname": "Nickname",
|
||||||
|
"member.user.mobile": "Mobile",
|
||||||
|
"member.user.email": "Email",
|
||||||
|
"member.user.gender": "Gender",
|
||||||
|
"member.user.gender.0": "Unknown",
|
||||||
|
"member.user.gender.1": "Male",
|
||||||
|
"member.user.gender.2": "Female",
|
||||||
|
"member.user.birthday": "Birthday",
|
||||||
|
"member.user.balance": "Balance",
|
||||||
|
"member.user.status": "Status",
|
||||||
|
"member.user.status.0": "Disabled",
|
||||||
|
"member.user.status.1": "Active",
|
||||||
|
"member.user.password": "Password",
|
||||||
|
"member.user.password.required": "Password is required",
|
||||||
|
"member.user.last_login_at": "Last Login",
|
||||||
|
"member.user.created_at": "Registered At",
|
||||||
|
"member.user.updated_at": "Updated At",
|
||||||
|
};
|
||||||
@@ -44,5 +44,8 @@ export default {
|
|||||||
"menu.system.storage": "Storage",
|
"menu.system.storage": "Storage",
|
||||||
"menu.system.config": "Configuration",
|
"menu.system.config": "Configuration",
|
||||||
"menu.system.ai": "AI",
|
"menu.system.ai": "AI",
|
||||||
|
"menu.member": "Mini Program Users",
|
||||||
|
"menu.member.user": "User List",
|
||||||
|
"menu.member.address": "Address Management",
|
||||||
"menu.xin-admin": "XinAdmin",
|
"menu.xin-admin": "XinAdmin",
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,9 @@ import aiChat from "./ai/chat";
|
|||||||
import aiConversation from "./ai/conversation";
|
import aiConversation from "./ai/conversation";
|
||||||
import aiAgent from "./ai/agent";
|
import aiAgent from "./ai/agent";
|
||||||
|
|
||||||
|
import memberUser from "./member/user";
|
||||||
|
import memberAddress from "./member/address";
|
||||||
|
|
||||||
import userProfile from "./user/profile";
|
import userProfile from "./user/profile";
|
||||||
|
|
||||||
import xinForm from "./components/xin-form";
|
import xinForm from "./components/xin-form";
|
||||||
@@ -49,6 +52,8 @@ export default {
|
|||||||
...aiChat,
|
...aiChat,
|
||||||
...aiConversation,
|
...aiConversation,
|
||||||
...aiAgent,
|
...aiAgent,
|
||||||
|
...memberUser,
|
||||||
|
...memberAddress,
|
||||||
...userProfile,
|
...userProfile,
|
||||||
...xinForm,
|
...xinForm,
|
||||||
...xinTable,
|
...xinTable,
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
export default {
|
||||||
|
"member.address.page.title": "地址管理",
|
||||||
|
"member.address.page.description": "管理小程序用户的收货地址",
|
||||||
|
"member.address.id": "地址ID",
|
||||||
|
"member.address.user_id": "所属用户",
|
||||||
|
"member.address.user_id.required": "用户ID为必填项",
|
||||||
|
"member.address.name": "收货人",
|
||||||
|
"member.address.name.required": "收货人为必填项",
|
||||||
|
"member.address.mobile": "联系电话",
|
||||||
|
"member.address.mobile.required": "联系电话为必填项",
|
||||||
|
"member.address.province": "省",
|
||||||
|
"member.address.province.required": "省份为必填项",
|
||||||
|
"member.address.city": "市",
|
||||||
|
"member.address.city.required": "城市为必填项",
|
||||||
|
"member.address.district": "区",
|
||||||
|
"member.address.district.required": "区县为必填项",
|
||||||
|
"member.address.detail": "详细地址",
|
||||||
|
"member.address.detail.required": "详细地址为必填项",
|
||||||
|
"member.address.full_address": "完整地址",
|
||||||
|
"member.address.is_default": "默认地址",
|
||||||
|
"member.address.is_default.0": "否",
|
||||||
|
"member.address.is_default.1": "是",
|
||||||
|
"member.address.created_at": "创建时间",
|
||||||
|
"member.address.updated_at": "更新时间",
|
||||||
|
};
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
export default {
|
||||||
|
"member.user.page.title": "用户列表",
|
||||||
|
"member.user.page.description": "管理小程序注册用户,查看用户信息与状态",
|
||||||
|
"member.user.id": "用户ID",
|
||||||
|
"member.user.avatar": "头像",
|
||||||
|
"member.user.username": "用户名",
|
||||||
|
"member.user.username.required": "用户名为必填项",
|
||||||
|
"member.user.nickname": "昵称",
|
||||||
|
"member.user.mobile": "手机号",
|
||||||
|
"member.user.email": "邮箱",
|
||||||
|
"member.user.gender": "性别",
|
||||||
|
"member.user.gender.0": "未知",
|
||||||
|
"member.user.gender.1": "男",
|
||||||
|
"member.user.gender.2": "女",
|
||||||
|
"member.user.birthday": "生日",
|
||||||
|
"member.user.balance": "余额",
|
||||||
|
"member.user.status": "状态",
|
||||||
|
"member.user.status.0": "禁用",
|
||||||
|
"member.user.status.1": "正常",
|
||||||
|
"member.user.password": "密码",
|
||||||
|
"member.user.password.required": "密码为必填项",
|
||||||
|
"member.user.last_login_at": "最后登录",
|
||||||
|
"member.user.created_at": "注册时间",
|
||||||
|
"member.user.updated_at": "更新时间",
|
||||||
|
};
|
||||||
@@ -44,5 +44,8 @@ export default {
|
|||||||
"menu.system.storage": "存储配置",
|
"menu.system.storage": "存储配置",
|
||||||
"menu.system.config": "系统配置",
|
"menu.system.config": "系统配置",
|
||||||
"menu.system.ai": "AI 配置",
|
"menu.system.ai": "AI 配置",
|
||||||
|
"menu.member": "小程序用户",
|
||||||
|
"menu.member.user": "用户列表",
|
||||||
|
"menu.member.address": "地址管理",
|
||||||
"menu.xin-admin": "XinAdmin",
|
"menu.xin-admin": "XinAdmin",
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,167 @@
|
|||||||
|
import { Tag, Typography } from 'antd';
|
||||||
|
import React from 'react';
|
||||||
|
import XinTable from '@/components/XinTable';
|
||||||
|
import type { XinTableColumn, XinTableProps } from '@/components/XinTable/typings';
|
||||||
|
import type IUserAddress from '@/domain/iUserAddress';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
import relativeTime from 'dayjs/plugin/relativeTime';
|
||||||
|
|
||||||
|
const { Title, Text } = Typography;
|
||||||
|
dayjs.extend(relativeTime);
|
||||||
|
|
||||||
|
const Table: React.FC = () => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
const columns: XinTableColumn<IUserAddress>[] = [
|
||||||
|
{
|
||||||
|
title: t('member.address.id'),
|
||||||
|
dataIndex: 'id',
|
||||||
|
hideInForm: true,
|
||||||
|
sorter: true,
|
||||||
|
align: 'center',
|
||||||
|
width: 80,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.address.user_id'),
|
||||||
|
dataIndex: 'user_id',
|
||||||
|
valueType: 'digit',
|
||||||
|
align: 'center',
|
||||||
|
required: true,
|
||||||
|
rules: [{ required: true, message: t('member.address.user_id.required') }],
|
||||||
|
render: (_, record) => {
|
||||||
|
if (record.user) {
|
||||||
|
return `${record.user.nickname || record.user.username} (${record.user.mobile || '-'})`;
|
||||||
|
}
|
||||||
|
return `ID: ${record.user_id}`;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.address.name'),
|
||||||
|
dataIndex: 'name',
|
||||||
|
valueType: 'text',
|
||||||
|
align: 'center',
|
||||||
|
required: true,
|
||||||
|
rules: [{ required: true, message: t('member.address.name.required') }],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.address.mobile'),
|
||||||
|
dataIndex: 'mobile',
|
||||||
|
valueType: 'text',
|
||||||
|
align: 'center',
|
||||||
|
required: true,
|
||||||
|
rules: [{ required: true, message: t('member.address.mobile.required') }],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.address.province'),
|
||||||
|
dataIndex: 'province',
|
||||||
|
valueType: 'text',
|
||||||
|
align: 'center',
|
||||||
|
required: true,
|
||||||
|
rules: [{ required: true, message: t('member.address.province.required') }],
|
||||||
|
hideInSearch: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.address.city'),
|
||||||
|
dataIndex: 'city',
|
||||||
|
valueType: 'text',
|
||||||
|
align: 'center',
|
||||||
|
required: true,
|
||||||
|
rules: [{ required: true, message: t('member.address.city.required') }],
|
||||||
|
hideInSearch: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.address.district'),
|
||||||
|
dataIndex: 'district',
|
||||||
|
valueType: 'text',
|
||||||
|
align: 'center',
|
||||||
|
required: true,
|
||||||
|
rules: [{ required: true, message: t('member.address.district.required') }],
|
||||||
|
hideInSearch: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.address.detail'),
|
||||||
|
dataIndex: 'detail',
|
||||||
|
valueType: 'text',
|
||||||
|
align: 'center',
|
||||||
|
required: true,
|
||||||
|
rules: [{ required: true, message: t('member.address.detail.required') }],
|
||||||
|
hideInSearch: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.address.full_address'),
|
||||||
|
dataIndex: 'full_address',
|
||||||
|
hideInForm: true,
|
||||||
|
hideInSearch: true,
|
||||||
|
align: 'center',
|
||||||
|
render: (_, record) =>
|
||||||
|
[record.province, record.city, record.district, record.detail]
|
||||||
|
.filter(Boolean)
|
||||||
|
.join(''),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.address.is_default'),
|
||||||
|
dataIndex: 'is_default',
|
||||||
|
valueType: 'switch',
|
||||||
|
align: 'center',
|
||||||
|
render: (value: number) =>
|
||||||
|
value === 1 ? (
|
||||||
|
<Tag color="blue">{t('member.address.is_default.1')}</Tag>
|
||||||
|
) : (
|
||||||
|
<Tag>{t('member.address.is_default.0')}</Tag>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.address.created_at'),
|
||||||
|
hideInForm: true,
|
||||||
|
hideInSearch: true,
|
||||||
|
dataIndex: 'created_at',
|
||||||
|
align: 'center',
|
||||||
|
render: (value: string) => (value ? dayjs(value).fromNow() : '-'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.address.updated_at'),
|
||||||
|
hideInForm: true,
|
||||||
|
hideInSearch: true,
|
||||||
|
dataIndex: 'updated_at',
|
||||||
|
align: 'center',
|
||||||
|
render: (value: string) => (value ? dayjs(value).fromNow() : '-'),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const tableProps: XinTableProps<IUserAddress> = {
|
||||||
|
api: '/member/address',
|
||||||
|
columns,
|
||||||
|
rowKey: 'id',
|
||||||
|
accessName: 'member.address',
|
||||||
|
scroll: { x: 1400 },
|
||||||
|
formProps: {
|
||||||
|
grid: true,
|
||||||
|
colProps: { span: 12 },
|
||||||
|
rowProps: { gutter: [30, 0] },
|
||||||
|
layout: 'vertical',
|
||||||
|
},
|
||||||
|
modalProps: {
|
||||||
|
width: 800,
|
||||||
|
},
|
||||||
|
cardProps: {
|
||||||
|
variant: 'borderless',
|
||||||
|
},
|
||||||
|
pagination: {
|
||||||
|
size: 'small',
|
||||||
|
style: { marginBottom: 0 },
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div className="mb-5">
|
||||||
|
<Title level={3}>{t('member.address.page.title')}</Title>
|
||||||
|
<Text type="secondary">{t('member.address.page.description')}</Text>
|
||||||
|
</div>
|
||||||
|
<XinTable<IUserAddress> {...tableProps} />
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Table;
|
||||||
@@ -0,0 +1,186 @@
|
|||||||
|
import { Tag, Typography } from 'antd';
|
||||||
|
import React from 'react';
|
||||||
|
import XinTable from '@/components/XinTable';
|
||||||
|
import type { XinTableColumn, XinTableProps } from '@/components/XinTable/typings';
|
||||||
|
import type IMemberUser from '@/domain/iMemberUser';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
import relativeTime from 'dayjs/plugin/relativeTime';
|
||||||
|
|
||||||
|
const { Title, Text } = Typography;
|
||||||
|
dayjs.extend(relativeTime);
|
||||||
|
|
||||||
|
const Table: React.FC = () => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
const columns: XinTableColumn<IMemberUser>[] = [
|
||||||
|
{
|
||||||
|
title: t('member.user.id'),
|
||||||
|
dataIndex: 'id',
|
||||||
|
hideInForm: true,
|
||||||
|
sorter: true,
|
||||||
|
align: 'center',
|
||||||
|
width: 80,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.user.avatar'),
|
||||||
|
dataIndex: 'avatar',
|
||||||
|
valueType: 'text',
|
||||||
|
hideInTable: true,
|
||||||
|
hideInSearch: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.user.username'),
|
||||||
|
dataIndex: 'username',
|
||||||
|
valueType: 'text',
|
||||||
|
align: 'center',
|
||||||
|
required: true,
|
||||||
|
rules: [{ required: true, message: t('member.user.username.required') }],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.user.nickname'),
|
||||||
|
dataIndex: 'nickname',
|
||||||
|
valueType: 'text',
|
||||||
|
align: 'center',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.user.mobile'),
|
||||||
|
dataIndex: 'mobile',
|
||||||
|
valueType: 'text',
|
||||||
|
align: 'center',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.user.email'),
|
||||||
|
dataIndex: 'email',
|
||||||
|
valueType: 'text',
|
||||||
|
align: 'center',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.user.gender'),
|
||||||
|
dataIndex: 'gender',
|
||||||
|
valueType: 'radio',
|
||||||
|
align: 'center',
|
||||||
|
hideInSearch: true,
|
||||||
|
fieldProps: {
|
||||||
|
options: [
|
||||||
|
{ value: 0, label: t('member.user.gender.0') },
|
||||||
|
{ value: 1, label: t('member.user.gender.1') },
|
||||||
|
{ value: 2, label: t('member.user.gender.2') },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
render: (value: number) => {
|
||||||
|
const map: Record<number, string> = {
|
||||||
|
0: t('member.user.gender.0'),
|
||||||
|
1: t('member.user.gender.1'),
|
||||||
|
2: t('member.user.gender.2'),
|
||||||
|
};
|
||||||
|
return map[value] || '-';
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.user.birthday'),
|
||||||
|
dataIndex: 'birthday',
|
||||||
|
valueType: 'date',
|
||||||
|
align: 'center',
|
||||||
|
hideInSearch: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.user.balance'),
|
||||||
|
dataIndex: 'balance',
|
||||||
|
hideInForm: true,
|
||||||
|
align: 'center',
|
||||||
|
render: (value: string) => `¥${value || '0.00'}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.user.status'),
|
||||||
|
dataIndex: 'status',
|
||||||
|
valueType: 'radioButton',
|
||||||
|
fieldProps: {
|
||||||
|
options: [
|
||||||
|
{ value: 0, label: t('member.user.status.0') },
|
||||||
|
{ value: 1, label: t('member.user.status.1') },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
render: (value: number) => {
|
||||||
|
return value === 1
|
||||||
|
? <Tag color="success">{t('member.user.status.1')}</Tag>
|
||||||
|
: <Tag color="error">{t('member.user.status.0')}</Tag>;
|
||||||
|
},
|
||||||
|
filters: [
|
||||||
|
{ text: t('member.user.status.0'), value: 0 },
|
||||||
|
{ text: t('member.user.status.1'), value: 1 },
|
||||||
|
],
|
||||||
|
align: 'center',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.user.password'),
|
||||||
|
dataIndex: 'password',
|
||||||
|
valueType: 'password',
|
||||||
|
hideInTable: true,
|
||||||
|
hideInSearch: true,
|
||||||
|
hideInUpdate: true,
|
||||||
|
rules: [{ required: true, message: t('member.user.password.required') }],
|
||||||
|
fieldProps: { autoComplete: 'new-password' },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.user.last_login_at'),
|
||||||
|
dataIndex: 'last_login_at',
|
||||||
|
hideInForm: true,
|
||||||
|
hideInSearch: true,
|
||||||
|
align: 'center',
|
||||||
|
render: (value: string) => (value ? dayjs(value).fromNow() : '-'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.user.created_at'),
|
||||||
|
hideInForm: true,
|
||||||
|
hideInSearch: true,
|
||||||
|
dataIndex: 'created_at',
|
||||||
|
align: 'center',
|
||||||
|
render: (value: string) => (value ? dayjs(value).fromNow() : '-'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('member.user.updated_at'),
|
||||||
|
hideInForm: true,
|
||||||
|
hideInSearch: true,
|
||||||
|
dataIndex: 'updated_at',
|
||||||
|
align: 'center',
|
||||||
|
render: (value: string) => (value ? dayjs(value).fromNow() : '-'),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const tableProps: XinTableProps<IMemberUser> = {
|
||||||
|
api: '/member/user',
|
||||||
|
columns,
|
||||||
|
rowKey: 'id',
|
||||||
|
accessName: 'member.user',
|
||||||
|
scroll: { x: 1400 },
|
||||||
|
formProps: {
|
||||||
|
grid: true,
|
||||||
|
colProps: { span: 12 },
|
||||||
|
rowProps: { gutter: [30, 0] },
|
||||||
|
layout: 'vertical',
|
||||||
|
},
|
||||||
|
modalProps: {
|
||||||
|
width: 800,
|
||||||
|
},
|
||||||
|
cardProps: {
|
||||||
|
variant: 'borderless',
|
||||||
|
},
|
||||||
|
pagination: {
|
||||||
|
size: 'small',
|
||||||
|
style: { marginBottom: 0 },
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div className="mb-5">
|
||||||
|
<Title level={3}>{t('member.user.page.title')}</Title>
|
||||||
|
<Text type="secondary">{t('member.user.page.description')}</Text>
|
||||||
|
</div>
|
||||||
|
<XinTable<IMemberUser> {...tableProps} />
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Table;
|
||||||
Reference in New Issue
Block a user