From 60f3794a9265cb95fcc84f936d8cddcab87f99a8 Mon Sep 17 00:00:00 2001
From: Sea <zhangh@jujiatech.com>
Date: Wed, 30 Oct 2024 15:03:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/HomeView.vue                            |  2 +-
 src/views/rescueCalculation/InfoFill.vue          | 14 ++++++---
 src/views/rescueCalculation/RescueCalculation.vue |  7 ++---
 src/views/rescueCalculation/Results.vue           | 38 +++++++++++++++++++----
 4 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 5fbce16..5048eb0 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -14,7 +14,7 @@
 
         <div class="news">
             <div class="news__title over-hidden_one">
-                市委常委会举行会议 深入学习贯彻习近平总书记重要讲话精神 研究部署进一步健全全面从严治党体系等工作步健全全面从严治党体系等工作
+                民政为民， 民政爱民
             </div>
             <div class="news__content">
 
diff --git a/src/views/rescueCalculation/InfoFill.vue b/src/views/rescueCalculation/InfoFill.vue
index cd7dc9a..a1b07f1 100644
--- a/src/views/rescueCalculation/InfoFill.vue
+++ b/src/views/rescueCalculation/InfoFill.vue
@@ -3,16 +3,20 @@
         <div class="info-fill">
             <div class="title">{{ title }}</div>
             <div class="input">
-                <span>请输入你的户籍人口</span>
+                <span>家庭共同生活成员数</span>
                 <div class="num-step">
                     <img @click="reduceFamily" src="../../assets/images/reduce.png" alt="">
                     <input disabled v-model="population" type="text">
                     <img @click="addFamily" src="../../assets/images/add.png" alt="">
                 </div>
-                <span style="margin-left: 6.25vw">请输入你的家庭月收入</span>
+                <span style="margin-left: 6.25vw">家庭月收入</span>
                 <el-input v-model="income" placeholder="请输入">
                     <template #suffix>元</template>
                 </el-input>
+                <span style="margin-left: 6.25vw">家庭刚性支出</span>
+                <el-input v-model="expenditure" placeholder="请输入">
+                    <template #suffix>元</template>
+                </el-input>
             </div>
             <div class="family">
                 <div class="family__title">
@@ -98,6 +102,7 @@ export default {
 
   data () {
     return {
+      expenditure: 0,
       archiveType: 'BLAN_CITY',
       title: '城市低保测算',
       radio1: 1,
@@ -200,11 +205,12 @@ export default {
     },
 
     async archiveAmountCalc (personList) {
+      const income = this.income - this.expenditure
       const params = {
         archive_type: this.archiveType, // 档案类型
         party_id: '5001560001', // 区划 ：
         family_ensure_count: this.population, // 人口数
-        income_sum: this.income, // 收入：
+        income_sum: income, // 收入：
         personList: personList
 
       }
@@ -258,7 +264,7 @@ export default {
     .input {
         height: 4.95vw;
         //background-color: pink;
-        padding-left: 17.97vw;
+        padding-left: 8.97vw;
         //border: 1px solid red;
         display: flex;
         align-items: center;
diff --git a/src/views/rescueCalculation/RescueCalculation.vue b/src/views/rescueCalculation/RescueCalculation.vue
index b043161..835c144 100644
--- a/src/views/rescueCalculation/RescueCalculation.vue
+++ b/src/views/rescueCalculation/RescueCalculation.vue
@@ -16,9 +16,8 @@
                         <span>温馨提示</span>
                     </div>
                     <div class="tip__content">
-                        此工具根据相关政策文件进行的粗略测算，测算金额不是实际办理结果。
+                        此工具根据相关政策文件进行的粗略测算，实际领取金额根据实际情况由工作人员核查后为准。
                     </div>
-
                 </div>
             </div>
 
@@ -92,9 +91,9 @@ export default {
             color: #347BD5;
         }
         &__content{
-            font-size: 0.94vw;
+            font-size: 1.15vw;
             color: #333333;
-            margin-top: 1.04vw;
+            margin-top: 0.8vw;
         }
         img{
             width: 1.67vw;
diff --git a/src/views/rescueCalculation/Results.vue b/src/views/rescueCalculation/Results.vue
index 4ba6a26..0f78bbe 100644
--- a/src/views/rescueCalculation/Results.vue
+++ b/src/views/rescueCalculation/Results.vue
@@ -16,8 +16,14 @@
                 </div>
                 <img src="@/assets/images/result.png" alt="">
             </div>
-            <div class="result__tip">
-                温馨提示：此工具根据相关政策文件进行的粗略测算，测算金额不是实际办理结果。
+            <div class="tip">
+                <div class="tip__title">
+                    <img src="../../assets/images/tip.png" alt="">
+                    <span>温馨提示</span>
+                </div>
+                <div class="tip__content">
+                    此工具根据相关政策文件进行的粗略测算，实际领取金额根据实际情况由工作人员核查后为准。
+                </div>
             </div>
             <div class="result__btn">
                 <router-link to="/"><img src="../../assets/images/btn_toHome.png" alt=""></router-link>
@@ -124,11 +130,31 @@ export default {
 
     }
 
-    &__tip {
-        font-size: 0.83vw;
-        margin-top: 1vw;
-        color: #333;
+    .tip{
+        width: 77.62vw;
+        height: 8.55vw;
+        //margin: 7.08vw auto 0;
+        background-color: #eff7ff;
+        border: 1px dashed #B7D7FF;
+        padding: 1.67vw 1.29vw;
+        border-radius: 4px;
+        margin-top: 0.6vw;
 
+        &__title{
+            display: flex;
+            align-items: center;
+            gap: 0.52vw;
+            font-size: 1.25vw;
+            color: #347BD5;
+        }
+        &__content{
+            font-size: 1.15vw;
+            color: #333333;
+            margin-top: 1vw;
+        }
+        img{
+            width: 1.67vw;
+        }
     }
 
     &__btn {