Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

src/apps/AppGridManagement/AddFamily.vue

@@ -142,6 +142,7 @@ export default {
   .userList {
     width: 100%;
     background-color: #FFFFFF ;
+    padding-bottom: 120px;
      ul {
        padding-left: 0px;
       li {

src/apps/AppGridManagement/FamilyList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="FamilyList">
     <div class="title">户主列表</div>
-    <div class="main">
+    <div class="main" v-if="list.length">
       <ul v-for="item in list" :key="item.id">
         <li>
           <div class="user">
@@ -68,7 +68,6 @@ export default {
 
 <style lang="scss" scoped>
 .FamilyList {
-  background-color: #FFFFFF;
   .title {
     padding: 24px 32px;
     background-color: #F3F6F9;
@@ -77,6 +76,7 @@ export default {
   }
   .main {
     background-color: #FFFFFF ;
+    padding-bottom: 112px;
     ul {
       padding: 0px 32px;
       background-color: #fff;

src/apps/AppGridManagement/Organization.vue

@@ -85,7 +85,6 @@ export default {
 <style lang="scss" scoped>
 .Organization {
   padding-top: 32px;
-  background-color: #f3f6f9;
   .select-gird{
   width: calc(100% - 60px);
   padding: 24px 32px;