Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/project/saas/AppBuilding/components/gridMap.vue

@@ -43,7 +43,7 @@
                    v-if="item.phone"> -->
               </span>
           </div>
-          <div class="info-flex">
+          <div class="info-flex" v-if="form.girdMemberManageList && !form.girdMemberManageList.length && !form.girdMemberList.length">
             <span class="label">管辖家庭</span>
             <span class="value">{{ form.residentNum || 0 }}户</span>
           </div>

src/project/saas/AppResidentDocument/DetailCard.vue

@@ -289,8 +289,8 @@
 
     .info {
       .info-group {
-        margin-bottom: 4px;
-        padding: 0 32px;
+        margin-bottom: 10px;
+        padding: 0 32px 20px;
         background: #FFFFFF;
 
         &:first-child {

src/project/saas/AppResidentDocument/DetailPeople.vue

@@ -200,13 +200,13 @@
   }
 
   .line {
-    height: 8px;
+    height: 10px;
     background: #f5f5f5;
   }
 
   .middle,
   .bottom {
-    padding: 0 32px;
+    padding: 0 32px 20px;
 
     .hint {
       height: 108px;