From 1b28b43df1da588dd759003519a7fff38f2e186f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cyansj=E2=80=9D?= <yansj@ydool.com>
Date: Thu, 1 Aug 2024 17:29:17 +0800
Subject: [PATCH 1/3] gx

---
 src/view/person/index.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/view/person/index.vue b/src/view/person/index.vue
index 2f36d98..7afe55c 100644
--- a/src/view/person/index.vue
+++ b/src/view/person/index.vue
@@ -131,9 +131,9 @@
                         <el-table-column prop="sum" label="使用金额" width="115" align="center" />
                         <el-table-column prop="sum" label="详情" width="135" align="center" />
                     </el-table>
-                    <el-pagination background layout="prev, pager, next" :page-size="pagination.pageSize"
-                        :total="pagination.total" prev-text="上一页" next-text="下一页"
-                        v-model:current-page="pagination.currentPage" @current-change="handlePagination" />
+                    <el-pagination background layout="prev, pager, next" :page-size="pagination1.pageSize"
+                        :total="pagination1.total" prev-text="上一页" next-text="下一页"
+                        v-model:current-page="pagination1.currentPage" @current-change="handlePagination" />
                 </div>
 
             </div>
@@ -205,7 +205,12 @@ const data1 = ref([
         info: '人民医院******'
     },
 ])
-
+const pagination1 = reactive({
+    current: 1,
+    pageSize: 5,
+    total: 50,
+    showTotal: 0
+})
 const dialogShow = ref(false)
 const tableType = reactive({
     title: '基础养老金',
@@ -234,10 +239,10 @@ const paginationDialog = reactive({
     showTotal: 0
 })
 const close = (pagination) => {
-    console.log
+    dialogShow.value = false
 }
 const handlePagination = (pagination) => {
-    console.log
+    dialogShow.value = false
 }
 
 </script>

From 765f0b9a0c97d647c5ed87279d1406d1e261d75f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cyansj=E2=80=9D?= <yansj@ydool.com>
Date: Fri, 2 Aug 2024 09:19:00 +0800
Subject: [PATCH 2/3] gx

---
 src/view/person/index.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/view/person/index.vue b/src/view/person/index.vue
index 7afe55c..7970e60 100644
--- a/src/view/person/index.vue
+++ b/src/view/person/index.vue
@@ -10,7 +10,7 @@
                 <div class="my-info">
 
                     <div class="my-info-item">
-                        <div class="my-info-label ">姓名</div>
+                        <div class="my-info-label ">姓&emsp;&emsp;名</div>
                         <div class="my-info-content">
                             <p>王一</p>
                         </div>
@@ -40,13 +40,13 @@
                         </div>
                     </div>
                     <div class="my-info-item">
-                        <div class="my-info-label ">民族</div>
+                        <div class="my-info-label ">民&emsp;&emsp;族</div>
                         <div class="my-info-content">
                             <p>汉</p>
                         </div>
                     </div>
                     <div class="my-info-item">
-                        <div class="my-info-label ">性别</div>
+                        <div class="my-info-label ">性&emsp;&emsp;别</div>
                         <div class="my-info-content">
                             <p>男</p>
                         </div>
@@ -77,6 +77,7 @@
                 <div class="main-tag-item">置业</div>
                 <div class="main-tag-item">退休<br />养老</div>
                 <div class="main-tag-item">身后事</div>
+                <div class="main-tag-item">综合</div>
                 <div class="person-main-person">
                 </div>
             </div>
@@ -310,8 +311,8 @@ const handlePagination = (pagination) => {
             }
 
             &:nth-of-type(4) {
-                top: 30px;
-                right: 220px;
+                top: 420px;
+                left: 110px;
             }
 
             &:nth-of-type(5) {
@@ -329,6 +330,11 @@ const handlePagination = (pagination) => {
                 right: 80px;
             }
 
+            &:nth-of-type(8) {
+                top: 420px;
+                right: 110px;
+            }
+
             &:hover {
                 background: url('../../assets/person/tag-active.png') no-repeat;
                 background-size: 100% 100%;

From aea2e1eb3b9fd992c354d8f207b754b39e26ed70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cyansj=E2=80=9D?= <yansj@ydool.com>
Date: Fri, 2 Aug 2024 09:22:00 +0800
Subject: [PATCH 3/3] gx

---
 src/view/person/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view/person/index.vue b/src/view/person/index.vue
index 7970e60..205c6cd 100644
--- a/src/view/person/index.vue
+++ b/src/view/person/index.vue
@@ -73,8 +73,8 @@
                 <div class="main-tag-item">出生</div>
                 <div class="main-tag-item">学习</div>
                 <div class="main-tag-item">工作</div>
-                <div class="main-tag-item">婚育</div>
                 <div class="main-tag-item">置业</div>
+                <div class="main-tag-item">婚育</div>
                 <div class="main-tag-item">退休<br />养老</div>
                 <div class="main-tag-item">身后事</div>
                 <div class="main-tag-item">综合</div>