父母情况

2026-01-25 04:11:11 +08:00 · 2026-01-25 04:11:11 +08:00 · 2551e8e001
commit 2551e8e001
parent 4dcb830b93
9 changed files with 270 additions and 70 deletions
--- a/admin/src/views/user/detail.vue
+++ b/admin/src/views/user/detail.vue
@ -454,6 +454,36 @@ onMounted(() => {

              <el-divider />

+              <el-descriptions
+                :column="3"
+                border
+                title="父母情况"
+              >
+                <el-descriptions-item label="孩子是否独居">
+                  {{ userDetail.profile.isLivingAlone ? '是' : '否' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="父母基本情况">
+                  {{ userDetail.profile.parentStatus || '-' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="父母退休情况">
+                  {{ userDetail.profile.parentRetireStatus || '-' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="父母居住城市">
+                  {{ userDetail.profile.parentProvince || '' }}{{ userDetail.profile.parentCity || '-' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="父母住房情况">
+                  {{ userDetail.profile.parentHousingStatus || '-' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="父母养老保险">
+                  {{ userDetail.profile.parentPensionStatus || '-' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="父母医疗保险">
+                  {{ userDetail.profile.parentMedicalStatus || '-' }}
+                </el-descriptions-item>
+              </el-descriptions>
+
+              <el-divider />
+
              <el-descriptions
                :column="3"
                border
--- a/miniapp/pages/profile/detail.vue
+++ b/miniapp/pages/profile/detail.vue
@ -231,16 +231,24 @@
              <text class="value">{{ userDetail.parentStatus || '未填写' }}</text>
            </view>
            <view class="parent-item">
-              <text class="label">是否退休</text>
-              <text class="value">{{ userDetail.isParentRetired ? '已退休' : '未退休' }}</text>
+              <text class="label">退休情况</text>
+              <text class="value">{{ userDetail.parentRetireStatus || '未填写' }}</text>
            </view>
            <view class="parent-item">
              <text class="label">父母现居</text>
              <text class="value">{{ userDetail.parentCity || '未填写' }}</text>
            </view>
            <view class="parent-item">
-              <text class="label">是否有房</text>
-              <text class="value">{{ userDetail.parentHasHouse ? '有' : '无' }}</text>
+              <text class="label">住房情况</text>
+              <text class="value">{{ userDetail.parentHousingStatus || '未填写' }}</text>
+            </view>
+            <view class="parent-item">
+              <text class="label">养老保险</text>
+              <text class="value">{{ userDetail.parentPensionStatus || '未填写' }}</text>
+            </view>
+            <view class="parent-item">
+              <text class="label">医疗保险</text>
+              <text class="value">{{ userDetail.parentMedicalStatus || '未填写' }}</text>
            </view>
          </view>
        </view>
--- a/miniapp/pages/profile/edit.vue
+++ b/miniapp/pages/profile/edit.vue
@ -545,9 +545,9 @@
          </view>
        </view>

-        <!-- 父母情况 -->
+        <!-- 父母基本情况 -->
        <view class="form-item">
-          <text class="form-label required">父母情况</text>
+          <text class="form-label required">父母基本情况</text>
          <picker 
            mode="selector"
            :range="parentStatusOptions"
@ -561,30 +561,25 @@
          </picker>
        </view>

-        <!-- 父母是否退休 -->
+        <!-- 父母退休情况 -->
        <view class="form-item">
-          <text class="form-label">父母是否退休</text>
-          <view class="radio-group">
-            <view 
-              class="radio-item" 
-              :class="{ active: formData.isParentRetired }"
-              @click="formData.isParentRetired = true"
-            >
-              <text>已退休</text>
+          <text class="form-label">父母退休情况</text>
+          <picker 
+            mode="selector"
+            :range="parentRetireOptions"
+            range-key="label"
+            @change="handleParentRetireChange"
+          >
+            <view class="picker-value">
+              {{ formData.parentRetireStatus || '请选择' }}
+              <text class="picker-arrow">▼</text>
            </view>
-            <view 
-              class="radio-item" 
-              :class="{ active: !formData.isParentRetired }"
-              @click="formData.isParentRetired = false"
-            >
-              <text>未退休</text>
-            </view>
-          </view>
+          </picker>
        </view>

-        <!-- 父母现居城市 -->
+        <!-- 父母居住城市 -->
        <view class="form-item">
-          <text class="form-label">父母现居城市</text>
+          <text class="form-label">父母居住城市</text>
          <picker 
            mode="region"
            :level="'city'"
@ -598,25 +593,52 @@
          </picker>
        </view>

-        <!-- 父母是否有房 -->
+        <!-- 父母住房情况 -->
        <view class="form-item">
-          <text class="form-label">父母是否有房</text>
-          <view class="radio-group">
-            <view 
-              class="radio-item" 
-              :class="{ active: formData.parentHasHouse }"
-              @click="formData.parentHasHouse = true"
-            >
-              <text>有</text>
+          <text class="form-label">父母住房情况</text>
+          <picker 
+            mode="selector"
+            :range="parentHousingOptions"
+            range-key="label"
+            @change="handleParentHousingChange"
+          >
+            <view class="picker-value">
+              {{ formData.parentHousingStatus || '请选择' }}
+              <text class="picker-arrow">▼</text>
            </view>
-            <view 
-              class="radio-item" 
-              :class="{ active: !formData.parentHasHouse }"
-              @click="formData.parentHasHouse = false"
-            >
-              <text>无</text>
+          </picker>
+        </view>
+
+        <!-- 父母养老保险 -->
+        <view class="form-item">
+          <text class="form-label">父母养老保险</text>
+          <picker 
+            mode="selector"
+            :range="parentPensionOptions"
+            range-key="label"
+            @change="handleParentPensionChange"
+          >
+            <view class="picker-value">
+              {{ formData.parentPensionStatus || '请选择' }}
+              <text class="picker-arrow">▼</text>
            </view>
-          </view>
+          </picker>
+        </view>
+
+        <!-- 父母医疗保险 -->
+        <view class="form-item">
+          <text class="form-label">父母医疗保险</text>
+          <picker 
+            mode="selector"
+            :range="parentMedicalOptions"
+            range-key="label"
+            @change="handleParentMedicalChange"
+          >
+            <view class="picker-value">
+              {{ formData.parentMedicalStatus || '请选择' }}
+              <text class="picker-arrow">▼</text>
+            </view>
+          </picker>
        </view>
      </view>

@ -767,11 +789,13 @@ const formData = reactive({
  phone: '',  // 验证后的手机号
  // 父母情况
  isLivingAlone: false,  // 是否独居
-  parentStatus: '',  // 父母情况
-  isParentRetired: false,  // 父母是否退休
+  parentStatus: '双亲健在',  // 父母基本情况
+  parentRetireStatus: '',  // 父母退休情况
  parentProvince: '',  // 父母现居省
  parentCity: '',  // 父母现居市
-  parentHasHouse: false,  // 父母是否有房
+  parentHousingStatus: '',  // 父母住房情况
+  parentPensionStatus: '',  // 父母养老保险
+  parentMedicalStatus: '',  // 父母医疗保险
  requirement: {
    ageMin: 0,
    ageMax: 0,
@ -841,13 +865,42 @@ const expectMarryOptions = [
  { value: 3, label: '孩子满意就结婚' }
 ]

-// 父母情况选项
+// 父母基本情况选项
 const parentStatusOptions = [
-  { value: '父母健在', label: '父母健在' },
+  { value: '双亲健在', label: '双亲健在' },
  { value: '父亲去世', label: '父亲去世' },
  { value: '母亲去世', label: '母亲去世' },
-  { value: '父母均已去世', label: '父母均已去世' },
-  { value: '父母离异', label: '父母离异' }
+  { value: '双亲去世', label: '双亲去世' }
+]
+
+// 父母退休情况选项
+const parentRetireOptions = [
+  { value: '双亲退休', label: '双亲退休' },
+  { value: '父亲退休', label: '父亲退休' },
+  { value: '母亲退休', label: '母亲退休' },
+  { value: '双亲未退休', label: '双亲未退休' }
+]
+
+// 父母住房情况选项
+const parentHousingOptions = [
+  { value: '与孩子同住', label: '与孩子同住' },
+  { value: '居住地有房且不与孩子同住', label: '居住地有房且不与孩子同住' }
+]
+
+// 父母养老保险选项
+const parentPensionOptions = [
+  { value: '双亲都有', label: '双亲都有' },
+  { value: '父亲有', label: '父亲有' },
+  { value: '母亲有', label: '母亲有' },
+  { value: '双亲都没有', label: '双亲都没有' }
+]
+
+// 父母医疗保险选项
+const parentMedicalOptions = [
+  { value: '双亲都有', label: '双亲都有' },
+  { value: '父亲有', label: '父亲有' },
+  { value: '母亲有', label: '母亲有' },
+  { value: '双亲都没有', label: '双亲都没有' }
 ]

 // 出生年份选项 (Property 9: Birth Year Range)
@ -1136,6 +1189,11 @@ const handleParentStatusChange = (e) => {
  formData.parentStatus = parentStatusOptions[e.detail.value].value
 }

+// 父母退休情况选择
+const handleParentRetireChange = (e) => {
+  formData.parentRetireStatus = parentRetireOptions[e.detail.value].value
+}
+
 // 父母现居城市选择
 const handleParentCityChange = (e) => {
  const [province, city] = e.detail.value
@ -1143,6 +1201,21 @@ const handleParentCityChange = (e) => {
  formData.parentCity = city
 }

+// 父母住房情况选择
+const handleParentHousingChange = (e) => {
+  formData.parentHousingStatus = parentHousingOptions[e.detail.value].value
+}
+
+// 父母养老保险选择
+const handleParentPensionChange = (e) => {
+  formData.parentPensionStatus = parentPensionOptions[e.detail.value].value
+}
+
+// 父母医疗保险选择
+const handleParentMedicalChange = (e) => {
+  formData.parentMedicalStatus = parentMedicalOptions[e.detail.value].value
+}
+
 // 多选切换
 const toggleEducationRequirement = (value) => {
  const idx = formData.requirement.education.indexOf(value)
--- a/server/src/XiangYi.Application/DTOs/Requests/ProfileRequests.cs
+++ b/server/src/XiangYi.Application/DTOs/Requests/ProfileRequests.cs
@ -121,14 +121,14 @@ public class ProfileRequest
    public bool IsLivingAlone { get; set; }

    /// <summary>
-    /// 父母情况
+    /// 父母基本情况
    /// </summary>
    public string? ParentStatus { get; set; }

    /// <summary>
-    /// 父母是否退休
+    /// 父母退休情况
    /// </summary>
-    public bool IsParentRetired { get; set; }
+    public string? ParentRetireStatus { get; set; }

    /// <summary>
    /// 父母现居省份
@ -141,9 +141,19 @@ public class ProfileRequest
    public string? ParentCity { get; set; }

    /// <summary>
-    /// 父母是否有房
+    /// 父母住房情况
    /// </summary>
-    public bool ParentHasHouse { get; set; }
+    public string? ParentHousingStatus { get; set; }
+
+    /// <summary>
+    /// 父母养老保险
+    /// </summary>
+    public string? ParentPensionStatus { get; set; }
+
+    /// <summary>
+    /// 父母医疗保险
+    /// </summary>
+    public string? ParentMedicalStatus { get; set; }

    /// <summary>
    /// 择偶要求
--- a/server/src/XiangYi.Application/DTOs/Responses/AdminUserResponses.cs
+++ b/server/src/XiangYi.Application/DTOs/Responses/AdminUserResponses.cs
@ -422,6 +422,46 @@ public class AdminUserProfileDto
    /// 更新时间
    /// </summary>
    public DateTime? UpdateTime { get; set; }
+
+    /// <summary>
+    /// 是否独居
+    /// </summary>
+    public bool IsLivingAlone { get; set; }
+
+    /// <summary>
+    /// 父母基本情况
+    /// </summary>
+    public string? ParentStatus { get; set; }
+
+    /// <summary>
+    /// 父母退休情况
+    /// </summary>
+    public string? ParentRetireStatus { get; set; }
+
+    /// <summary>
+    /// 父母居住省份
+    /// </summary>
+    public string? ParentProvince { get; set; }
+
+    /// <summary>
+    /// 父母居住城市
+    /// </summary>
+    public string? ParentCity { get; set; }
+
+    /// <summary>
+    /// 父母住房情况
+    /// </summary>
+    public string? ParentHousingStatus { get; set; }
+
+    /// <summary>
+    /// 父母养老保险
+    /// </summary>
+    public string? ParentPensionStatus { get; set; }
+
+    /// <summary>
+    /// 父母医疗保险
+    /// </summary>
+    public string? ParentMedicalStatus { get; set; }
 }


--- a/server/src/XiangYi.Application/DTOs/Responses/ProfileResponses.cs
+++ b/server/src/XiangYi.Application/DTOs/Responses/ProfileResponses.cs
@ -191,14 +191,14 @@ public class ProfileResponse
    public bool IsLivingAlone { get; set; }

    /// <summary>
-    /// 父母状况
+    /// 父母基本情况
    /// </summary>
    public string? ParentStatus { get; set; }

    /// <summary>
-    /// 父母是否退休
+    /// 父母退休情况
    /// </summary>
-    public bool IsParentRetired { get; set; }
+    public string? ParentRetireStatus { get; set; }

    /// <summary>
    /// 父母现居省份
@ -211,9 +211,19 @@ public class ProfileResponse
    public string? ParentCity { get; set; }

    /// <summary>
-    /// 父母是否有房
+    /// 父母住房情况
    /// </summary>
-    public bool ParentHasHouse { get; set; }
+    public string? ParentHousingStatus { get; set; }
+
+    /// <summary>
+    /// 父母养老保险
+    /// </summary>
+    public string? ParentPensionStatus { get; set; }
+
+    /// <summary>
+    /// 父母医疗保险
+    /// </summary>
+    public string? ParentMedicalStatus { get; set; }
 }

 /// <summary>
--- a/server/src/XiangYi.Application/Services/AdminUserService.cs
+++ b/server/src/XiangYi.Application/Services/AdminUserService.cs
@ -615,7 +615,16 @@ public class AdminUserService : IAdminUserService
            AuditTime = profile.AuditTime,
            RejectReason = profile.RejectReason,
            CreateTime = profile.CreateTime,
-            UpdateTime = profile.UpdateTime
+            UpdateTime = profile.UpdateTime,
+            // 父母情况
+            IsLivingAlone = profile.IsLivingAlone,
+            ParentStatus = profile.ParentStatus,
+            ParentRetireStatus = profile.ParentRetireStatus,
+            ParentProvince = profile.ParentProvince,
+            ParentCity = profile.ParentCity,
+            ParentHousingStatus = profile.ParentHousingStatus,
+            ParentPensionStatus = profile.ParentPensionStatus,
+            ParentMedicalStatus = profile.ParentMedicalStatus
        };
    }

--- a/server/src/XiangYi.Application/Services/ProfileService.cs
+++ b/server/src/XiangYi.Application/Services/ProfileService.cs
@ -98,10 +98,12 @@ public class ProfileService : IProfileService
                // 父母情况
                IsLivingAlone = request.IsLivingAlone,
                ParentStatus = request.ParentStatus,
-                IsParentRetired = request.IsParentRetired,
+                ParentRetireStatus = request.ParentRetireStatus,
                ParentProvince = request.ParentProvince,
                ParentCity = request.ParentCity,
-                ParentHasHouse = request.ParentHasHouse,
+                ParentHousingStatus = request.ParentHousingStatus,
+                ParentPensionStatus = request.ParentPensionStatus,
+                ParentMedicalStatus = request.ParentMedicalStatus,
                AuditStatus = (int)AuditStatus.Pending, // 新资料设为待审核
                CreateTime = DateTime.Now,
                UpdateTime = DateTime.Now
@ -139,10 +141,12 @@ public class ProfileService : IProfileService
            // 父母情况
            existingProfile.IsLivingAlone = request.IsLivingAlone;
            existingProfile.ParentStatus = request.ParentStatus;
-            existingProfile.IsParentRetired = request.IsParentRetired;
+            existingProfile.ParentRetireStatus = request.ParentRetireStatus;
            existingProfile.ParentProvince = request.ParentProvince;
            existingProfile.ParentCity = request.ParentCity;
-            existingProfile.ParentHasHouse = request.ParentHasHouse;
+            existingProfile.ParentHousingStatus = request.ParentHousingStatus;
+            existingProfile.ParentPensionStatus = request.ParentPensionStatus;
+            existingProfile.ParentMedicalStatus = request.ParentMedicalStatus;
            existingProfile.AuditStatus = (int)AuditStatus.Pending; // 更新资料重置为待审核
            existingProfile.RejectReason = null; // 清除之前的拒绝原因
            existingProfile.UpdateTime = DateTime.Now;
@ -255,10 +259,12 @@ public class ProfileService : IProfileService
            // 父母情况
            IsLivingAlone = profile.IsLivingAlone,
            ParentStatus = profile.ParentStatus,
-            IsParentRetired = profile.IsParentRetired,
+            ParentRetireStatus = profile.ParentRetireStatus,
            ParentProvince = profile.ParentProvince,
            ParentCity = profile.ParentCity,
-            ParentHasHouse = profile.ParentHasHouse,
+            ParentHousingStatus = profile.ParentHousingStatus,
+            ParentPensionStatus = profile.ParentPensionStatus,
+            ParentMedicalStatus = profile.ParentMedicalStatus,
            IsMember = user.IsMember,
            IsRealName = user.IsRealName,
            Photos = photos.OrderBy(p => p.Sort).Select(p => new PhotoResponse
--- a/server/src/XiangYi.Core/Entities/Biz/UserProfile.cs
+++ b/server/src/XiangYi.Core/Entities/Biz/UserProfile.cs
@ -154,15 +154,16 @@ public class UserProfile : BaseEntity
    public bool IsLivingAlone { get; set; }

    /// <summary>
-    /// 父母情况
+    /// 父母基本情况
    /// </summary>
    [Column(StringLength = 50)]
    public string? ParentStatus { get; set; }

    /// <summary>
-    /// 父母是否退休
+    /// 父母退休情况
    /// </summary>
-    public bool IsParentRetired { get; set; }
+    [Column(StringLength = 50)]
+    public string? ParentRetireStatus { get; set; }

    /// <summary>
    /// 父母现居省份
@ -177,9 +178,22 @@ public class UserProfile : BaseEntity
    public string? ParentCity { get; set; }

    /// <summary>
-    /// 父母是否有房
+    /// 父母住房情况
    /// </summary>
-    public bool ParentHasHouse { get; set; }
+    [Column(StringLength = 50)]
+    public string? ParentHousingStatus { get; set; }
+
+    /// <summary>
+    /// 父母养老保险
+    /// </summary>
+    [Column(StringLength = 50)]
+    public string? ParentPensionStatus { get; set; }
+
+    /// <summary>
+    /// 父母医疗保险
+    /// </summary>
+    [Column(StringLength = 50)]
+    public string? ParentMedicalStatus { get; set; }

    #region 导航属性