From 0b919756b1d2b991cabed993541a191dfa4f6a5c Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 20 Jan 2022 13:37:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BE=BF=E6=B0=91=E9=80=9A=E8=AE=AF?=
 =?UTF-8?q?=E5=BD=95=E5=9C=B0=E5=8C=BA=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppMailList/AppMailList.vue    |  39 ++++++++++++++++++++++--
 src/apps/AppMailList/img/local-icon.png | Bin 0 -> 1121 bytes
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 src/apps/AppMailList/img/local-icon.png

diff --git a/src/apps/AppMailList/AppMailList.vue b/src/apps/AppMailList/AppMailList.vue
index ad870474..90fd553f 100644
--- a/src/apps/AppMailList/AppMailList.vue
+++ b/src/apps/AppMailList/AppMailList.vue
@@ -1,5 +1,15 @@
 <template>
   <div class="AppMailList">
+    <AiTopFixed>
+      <div class="area-content">
+        <AiAreaPicker :areaId="user.areaId" :value="areaId" @select="areaSelect" :name.sync="areaName">
+          <img src="./img/local-icon.png" alt="">
+          <span class="label" v-if="areaName">{{ areaName }}</span>
+          <span v-else>请选择</span>
+          <u-icon name="arrow-down" color="#666" size="24"/>
+        </AiAreaPicker>
+      </div>
+    </AiTopFixed>
     <div class="list-content">
       <u-index-list :scrollTop="scrollTop" :index-list="indexList">
         <div v-for="(letter, index) in indexList" :key="index">
@@ -41,11 +51,15 @@ export default {
     return {
       scrollTop: 0,
       list: [],
-      indexList: []
+      indexList: [],
+      areaId: '',
+      areaName: ''
     }
   },
   computed: { ...mapState(['user']) },
   mounted() {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
     this.getList()
     uni.$on('updateList', () => {
       this.getList()
@@ -56,13 +70,17 @@ export default {
   },
 
   methods: {
+    areaSelect(e) {
+      this.areaId = e
+      this.getList()
+    },
     callPhone(phone) {
       uni.makePhoneCall({phoneNumber: phone})
     },
     getList() {
       this.$http.post(`/app/appconvenientaddressbook/list`, null, {
         params: {
-          areaId: this.user.areaId,
+          areaId: this.areaId,
           isPublic: 1,
           resource: "portal",
           size: 999
@@ -89,6 +107,23 @@ export default {
 
 <style lang="scss" scoped>
 .AppMailList {
+  ::v-deep .fixed{
+    z-index: 9999;
+  }
+  .area-content {
+    width: 100%;
+    line-height: 64px;
+
+    img {
+      width: 42px;
+      vertical-align: middle;
+      margin-right: 16px;
+    }
+
+    .u-icon {
+      margin-left: 6px;
+    }
+  }
   // background-color: #F3F6F9;
   .list-content{
     padding-bottom: 112px;
diff --git a/src/apps/AppMailList/img/local-icon.png b/src/apps/AppMailList/img/local-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e23aff6ab5f4ec6d80c86118da1c7f1f48fc80b
GIT binary patch
literal 1121
zcmV-n1fKheP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NF%Sl8*RA>e5SUqS{Q53%CCAKzc
z6$h!sZXJt=t>Vw5;-JMYf=)V!iiiz}b5#&s9JG*bRa`oVf-a>Bia1EI^iL5ti%Zc)
z6bH%ck2S}0lDzVopLfnnZt9W?;oaQx_kHJ{`}3YL^;XY7Jp=U&{Lc)4t>DK-u`xB9
zK4=UaHwJgovki^e#{MbDJdJ&$-UoV)w06YbJnw-e8?mb<uy+Vs|17%wh~_MTi|ar^
z8o)f<urYRP`~swOHl?*HCUEjGHq55n>jeCY9(W;$ERlhZ*4WJ_r(n5Is`+0L0nYmJ
zg8P(!AJ7DmbzrQaDR!cg*$7RbJGrzYgDay1zFh_uMg!&?i1th+8b5}z3ZtCQ{G@&G
z9txPFnb;j>CLGUHdUDO@%f@o%{gJVqHiTy!%Rd^_R}<g`Yp>?ZLqf#;xme|O{1Vj~
z$d}G65m0WE{t)5&0N_R(?3lRROy@^%Q_TSH^Xmnk;nFO`{$}7>F!Y>MB)}(Z?vT>B
zBOL&w3=TPtvu|@G-oiib^BBvNUYNxhjxFg&C57Dez^F<G4A6DKIX#_ddR^dmoc@n@
zB^MqUlNm;XZ3Xh8zr?g9^(B3X1TTt&z5#ItD5Z3_Q8dmjlmx$OoFzs&>Y2zu@2YW`
zj)DMR%;ZM9!Tl1MFEV5u)-4j07@)P#Sz>t2kb(e+)6E{K#viQl9Pmf0OC>3uIU)h?
zN*sVED{6tJPm+!&SL=e=?%9-kiUi6TuFp7%?+hXVs#ozaVKTpQL9ADgv|1P8hi6mn
zDH5O!nYKo`(SkcCYvnZ5x?sLbJ{1J`HBfG}R?gEte^}CF9oCifa&mkp=_v@{h~y+I
zM+AeJ;UE%O8R^g|OO+`%$G}TTOLWA?`TS@1r}{3$R|(qZd8_nx8?JdSn{4Kl;K|;F
zhS=7ri{J*45DBnxS2CR>0DVD@Y|H4S|K4<>`KshsQ9{P>*8@7L(vmY<a?1W<#4&d?
z{!|3`6^}A9pmAtL2h3f~y8y>h5nx6B^g**Q#{F70x<0(!)ET>>jiFitp0k?2)Mxj7
z*fo=gfAwNYPxTD2BQB+A1bgXQ;V;Q?XgT?eMB!){@Eju)0XCr8eD44pu}Xr#v(L#(
z@fnU0riCgYzvJ$~bXNxPl|i$`KOVZD2S3#ppAKzH1{D+FU{#Z-5<Fw5ia=E)EP%H{
zpdu2Mz*{2_iiAb*Rtcy`SO#yMKp=@4fUgOGk|b&bzGej2@t(n@&Xvr{ZMp<v1fu;D
neU0j`7HnT{^$gTApv%BNee`t*HU#Bi00000NkvXXu0mjftbXz<

literal 0
HcmV?d00001


From d242a787e486b244271aecf393e94e952a3c3234 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 20 Jan 2022 13:57:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E5=AE=B6=E5=BA=AD=20?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BCid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppGridManagement/AddFamily.vue    | 7 +++++--
 src/apps/AppGridManagement/FamilyList.vue   | 6 ++++--
 src/apps/AppGridManagement/Organization.vue | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppGridManagement/AddFamily.vue b/src/apps/AppGridManagement/AddFamily.vue
index edd7d864..18117b67 100644
--- a/src/apps/AppGridManagement/AddFamily.vue
+++ b/src/apps/AppGridManagement/AddFamily.vue
@@ -56,7 +56,8 @@ export default {
       userList: {},
       userId: '',
       areaId: '',
-      areaName:''
+      areaName:'',
+      girdId: ''
     }
   },
   computed: { ...mapState(['user']) },
@@ -88,7 +89,8 @@ export default {
           var info = {
             girdMemberId: this.userId,
             residentId: item.id,
-            name: item.name
+            name: item.name,
+            girdId: this.girdId
           }
           checkUserList.push(info)
         }
@@ -117,6 +119,7 @@ export default {
     this.userId = option.id
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
+    this.girdId = option.girdId
   },
   onShow() {
     document.title = '新增责任家庭'
diff --git a/src/apps/AppGridManagement/FamilyList.vue b/src/apps/AppGridManagement/FamilyList.vue
index cf4547b5..f9295102 100644
--- a/src/apps/AppGridManagement/FamilyList.vue
+++ b/src/apps/AppGridManagement/FamilyList.vue
@@ -42,7 +42,8 @@ export default {
       current:1,
       userId: '',
       edit: true,
-      checked: true
+      checked: true,
+      girdId: ''
     }
   },
   methods: {
@@ -54,7 +55,7 @@ export default {
       })
     },
     toAddFamily(){
-      uni.navigateTo({url: `./AddFamily?id=${this.userId}`})
+      uni.navigateTo({url: `./AddFamily?id=${this.userId}&girdId=${this.girdId}`})
     },
     userClick(index) {
       this.list[index].checked = !this.list[index].checked
@@ -91,6 +92,7 @@ export default {
   },
   onLoad(option) {
     this.userId = option.id
+    this.girdId = option.girdId
     console.log(this.userId)
   },
   onShow() {
diff --git a/src/apps/AppGridManagement/Organization.vue b/src/apps/AppGridManagement/Organization.vue
index 5a96b3fc..365ab490 100644
--- a/src/apps/AppGridManagement/Organization.vue
+++ b/src/apps/AppGridManagement/Organization.vue
@@ -16,7 +16,7 @@
       <div class="right">
         <div class="name">{{item.name}} 
           <span class="gird">{{item.checkType == 2 ? '网格长' : '网格员'}}</span>
-          <span class="family-btn" @click="linkTo(`./FamilyList?id=${item.id}`)" v-if="item.checkType == 1">责任家庭 ></span>
+          <span class="family-btn" @click="linkTo(`./FamilyList?id=${item.id}&girdId=${userGird.id}`)" v-if="item.checkType == 1">责任家庭 ></span>
         </div>
         <p>{{item.girdName}} </p>
       </div>