diff --git a/.gitignore b/.gitignore index d4e5149..83ff3bb 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ admin-console/dist/ docs/reference/小程序及后台管理软件开发资料/ 软件系统说明.docx *.docx +!docs/protocols/协议简述.docx cloud/sql/ diff --git a/admin-console/src/styles/common.css b/admin-console/src/styles/common.css index ab957c7..b846592 100644 --- a/admin-console/src/styles/common.css +++ b/admin-console/src/styles/common.css @@ -84,6 +84,14 @@ cursor: pointer; } +.btn-danger { + background: #ff4d4f; + color: #fff; + border: none; + border-radius: 6px; + cursor: pointer; +} + .btn-sm { height: 32px; padding: 0 16px; diff --git a/admin-console/src/views/UserDetailView.vue b/admin-console/src/views/UserDetailView.vue index af26e0f..1d12058 100644 --- a/admin-console/src/views/UserDetailView.vue +++ b/admin-console/src/views/UserDetailView.vue @@ -5,6 +5,10 @@ 👥 用户详情 - {{ user.nickname || user.user_id }} + + + + @@ -12,7 +16,10 @@ {{ user.nickname || '-' }} {{ user.phone || '-' }} - {{ subStatusText(user.subscription_status) }} + + {{ statusText(user.status) }} + {{ subStatusText(user.subscription_status) }} + @@ -35,6 +42,10 @@ 基本信息 + + 用户状态 + {{ statusText(user.status) }} + 绑定设备 {{ user.devices && user.devices.length > 0 ? user.devices[0].device_name || user.devices[0].device_id : '无' }} @@ -54,6 +65,29 @@ + + 绑定设备 + + + + 设备编号 + 设备名称 + 操作 + + + + + {{ device.device_id }} + {{ device.device_name || '-' }} + + 详情 + 解绑 + + + + + + 护理记录 @@ -80,7 +114,7 @@