From 7c834349d91a9529ec819ff48d6e90dca5c16d74 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 20 Apr 2022 15:57:52 +0800
Subject: [PATCH] 29217

---
 .../AppGreatPowerIntegral.vue                 | 11 +++++++
 .../AppNeighborLinkage/memberInfo.vue         | 30 +++++++++----------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/project/sanjianxi/AppGreatPowerIntegral/AppGreatPowerIntegral.vue b/project/sanjianxi/AppGreatPowerIntegral/AppGreatPowerIntegral.vue
index b7c7d6f..8cd5244 100644
--- a/project/sanjianxi/AppGreatPowerIntegral/AppGreatPowerIntegral.vue
+++ b/project/sanjianxi/AppGreatPowerIntegral/AppGreatPowerIntegral.vue
@@ -25,10 +25,21 @@ export default {
 <style lang="scss" scoped>
 .AppGreatPowerIntegral {
   .myIntegral {
+    padding-top: 30px;
+    box-sizing: border-box;
     height: 344px;
     width: 100%;
     background: #4181FF;
     text-align: center;
+    span {
+      font-size: 100px;
+      font-weight: 600;
+      color: #FFFFFF;
+    }
+    label {
+      font-size: 32px;
+      color: #FFFFFF;
+    }
   }
 }
 </style>
\ No newline at end of file
diff --git a/project/sanjianxi/AppNeighborLinkage/memberInfo.vue b/project/sanjianxi/AppNeighborLinkage/memberInfo.vue
index 3ce0600..e36aaf1 100644
--- a/project/sanjianxi/AppNeighborLinkage/memberInfo.vue
+++ b/project/sanjianxi/AppNeighborLinkage/memberInfo.vue
@@ -18,57 +18,57 @@
       <h2>个人基本信息</h2>
       <div class="items">
         <p>家庭住址</p>
-        <div>{{ data.householdAreaName }}</div>
+        <div>{{ data.householdAreaName || '' }}</div>
       </div>
       <div class="item">
-        <span>性别</span><span>{{ $dict.getLabel('sex',data.sex) }}</span>
+        <span>性别</span><span>{{ $dict.getLabel('sex',data.sex) || '' }}</span>
       </div>
       <div class="item">
-        <span>年龄</span><span>{{ data.age }}</span>
+        <span>年龄</span><span>{{ data.age  }}</span>
       </div>
       <div class="item">
-        <span>民族</span><span>{{ $dict.getLabel('nation',data.nation) }}</span>
+        <span>民族</span><span>{{ $dict.getLabel('nation',data.nation) || '' }}</span>
       </div>
       <div class="item">
-        <span>文化程度</span><span>{{ $dict.getLabel('education',data.education) }}</span>
+        <span>文化程度</span><span>{{ $dict.getLabel('education',data.education) || '' }}</span>
       </div>
       <div class="item">
-        <span>婚姻状况</span><span>{{ $dict.getLabel('maritalStatus',data.maritalStatus) }}</span>
+        <span>婚姻状况</span><span>{{ $dict.getLabel('maritalStatus',data.maritalStatus) || '' }}</span>
       </div>
       <div class="item">
-        <span>政治面貌</span><span>{{ $dict.getLabel('politicsStatus',data.politicsStatus) }}</span>
+        <span>政治面貌</span><span>{{ $dict.getLabel('politicsStatus',data.politicsStatus) || '' }}</span>
       </div>
       <div class="item">
-        <span>兵役状况</span><span>{{ $dict.getLabel('militaryStatus',data.militaryStatus) }}</span>
+        <span>兵役状况</span><span>{{ $dict.getLabel('militaryStatus',data.militaryStatus) || '' }}</span>
       </div>
       <div class="item">
-        <span>宗教信仰</span><span>{{ $dict.getLabel('faithType',data.faithType) }}</span>
+        <span>宗教信仰</span><span>{{ $dict.getLabel('faithType',data.faithType) || '' }}</span>
       </div>
       <div class="item">
-        <span>职业</span><span>{{ $dict.getLabel('job',data.job) }}</span>
+        <span>职业</span><span>{{ $dict.getLabel('job',data.job) || '' }}</span>
       </div>
     </div>
 
     <div class="contactInfo">
       <h2>联络信息</h2>
       <div class="item">
-        <span>联系方式</span><span>{{ data.phone }}</span>
+        <span>联系方式</span><span>{{ data.phone || '' }}</span>
       </div>
       <div class="items">
         <p>现住址</p>
-        <div>{{ data.currentAreaName }}</div>
+        <div>{{ data.currentAreaName || '' }}</div>
       </div>
       <div class="items">
         <p>现住详细地址</p>
-        <div>{{ data.currentAddress }}</div>
+        <div>{{ data.currentAddress || '' }}</div>
       </div>
       <div class="items">
         <p>户籍地址</p>
-        <div>{{ data.householdAreaName }}</div>
+        <div>{{ data.householdAreaName || '' }}</div>
       </div>
       <div class="items">
         <p>户籍详细地址</p>
-        <div>{{ data.householdAddress }}</div>
+        <div>{{ data.householdAddress || '' }}</div>
       </div>
     </div>
   </div>