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

src/apps/AppGridManagement/AddFamily.vue

@@ -21,7 +21,8 @@
             </div>
             <div class="userInfo">
               <div>
-               <img src="./components/img/user-img.png" alt="" class="userImg" >
+               <img src="item.photo" alt="" class="userImg"  v-if="item.photo">
+               <img src="./components/img/user-img.png" alt="" class="userImg" v-else>
               </div>
               <div class="info">
                  <div class="name">
@@ -172,9 +173,10 @@ export default {
           padding-right: 48px;
           width: calc(100% - 100px);
           .userImg {
-          padding-right: 32px;
+          margin-right: 32px;
           width: 80px;
           height: 80px;
+          border-radius: 50%;
           }
           .info {
           width: calc(100% - 120px);

src/apps/AppGridManagement/AppGridManagement.vue

@@ -1,14 +1,17 @@
 <template>
   <div class="AppGridManagement">
-    <div class="pad-t32" v-if="component != 'Map' && isAdmin"></div>
-    <div class="select-gird" v-if="component != 'Map' && isAdmin">
-      <img src="./components/img/gird-icon.png" alt="" class="gird-icon">
-      <div @click="linkTo('./SelectGird')">
-        {{params.girdName}}
-        <img src="./components/img/down-icon.png" alt="" class="down-icon"> 
+    <div class="header" v-if="component != 'Map' && isAdmin">
+      <div class="pad-t32"></div>
+      <div class="select-gird">
+        <img src="./components/img/gird-icon.png" alt="" class="gird-icon">
+        <div @click="linkTo('./SelectGird')">
+          {{params.girdName}}
+          <img src="./components/img/down-icon.png" alt="" class="down-icon"> 
+        </div>
+        <span @click="linkTo('./SetGird')" v-if="checkType == 2">网格配置</span>
       </div>
-      <span @click="linkTo('./SetGird')" v-if="checkType == 2">网格配置</span>
     </div>
+    
     <component v-if="refresh && isAdmin" :is="component" @change="onChange" :params="params"> </component>
     <div class="tabs" v-if="isTab && isAdmin">
       <div class="item" @click="tabClick(index, item.component)" v-for="(item, index) in tabs" :key="index">
@@ -129,6 +132,13 @@ export default {
 .pad-t32{
   padding-top: 32px;
 }
+.header{
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 9;
+  width: 100%;
+}
 .select-gird{
   width: calc(100% - 60px);
   padding: 24px 32px;

src/apps/AppGridManagement/FamilyList.vue

@@ -150,6 +150,7 @@ export default {
           margin-right: 32px;
           width: 80px;
           height: 80px;
+          border-radius: 50%;
         }
           .userInfo {
             width: 100%;

src/apps/AppGridManagement/Organization.vue

@@ -65,6 +65,7 @@ export default {
 <style lang="scss" scoped>
 .Organization {
   background-color: #f5f5f5;
+  padding-top: 160px;
   .title{
     font-size: 38px;
     font-family: PingFangSC-Semibold, PingFang SC;

src/apps/AppGridManagement/Statistics.vue

@@ -113,7 +113,7 @@ uni-page-body {
   height: 100%;
 }
 .Statistics {
-  padding: 0 30px;
+  padding: 130px 30px 0;
   box-sizing: border-box;
 
   .middle {