From 06d81ba7eacdc1c76a53ad33cbc3755d96c0e83a Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 9 Jun 2022 17:25:56 +0800
Subject: [PATCH 1/5] BUG 30135

---
 src/project/beta/AppGridManagement/SelectGird.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/project/beta/AppGridManagement/SelectGird.vue b/src/project/beta/AppGridManagement/SelectGird.vue
index 3b379800..092afa8d 100644
--- a/src/project/beta/AppGridManagement/SelectGird.vue
+++ b/src/project/beta/AppGridManagement/SelectGird.vue
@@ -70,14 +70,14 @@ export default {
     getAllGrids() {
       this.slectList = []
       let {girdMemberId} = this.user,
-          url = `/app/appgirdinfo/queryAppGirdInfoByGirdLevel`,
+          url = `/app/appgirdinfo/queryMyGirdListByLevel2AndUser`,
           params = {girdMemberId}
       if (this.isApply) {
         url = `/app/appgirdinfo/listByInfo`
         params = {}
       }
       if (this.isMyGirds) {
-        url = `/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser`
+        url = `/app/appgirdmemberinfo/queryMyGirdListByLevel2`
         params = {}
       }
       this.$http.post(url, null, {params}).then((res) => {
@@ -145,7 +145,9 @@ export default {
     },
     submit() {
       if (this.SelectGird.id != null) {
-        uni.setStorageSync("lastSelectedGrid", this.SelectGird.parentGirdId)
+        if (!this.isApply && !this.isMyGirds) {
+          uni.setStorageSync("lastSelectedGrid", this.SelectGird.parentGirdId)
+        }
         uni.navigateBack({
           success: () => {
             uni.$emit("pagePicker:custom", this.SelectGird)

From a33dc07e9c636694f1bf93a68af98d5cd762aa93 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 9 Jun 2022 17:47:36 +0800
Subject: [PATCH 2/5] BUG 30137

---
 src/project/beta/AppGridManagement/SelectGird.vue      | 5 ++---
 src/project/beta/AppSpecialPeople/AppSpecialPeople.vue | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/project/beta/AppGridManagement/SelectGird.vue b/src/project/beta/AppGridManagement/SelectGird.vue
index 092afa8d..7f6f5a57 100644
--- a/src/project/beta/AppGridManagement/SelectGird.vue
+++ b/src/project/beta/AppGridManagement/SelectGird.vue
@@ -50,7 +50,7 @@ export default {
   computed: {
     ...mapState(['user']),
     isMyGirds() {
-      return !!this.$route.query.self
+      return this.$route.query.self == true
     },
     isGridMember() {
       return this.user.girdCheckType > 0
@@ -70,7 +70,7 @@ export default {
     getAllGrids() {
       this.slectList = []
       let {girdMemberId} = this.user,
-          url = `/app/appgirdinfo/queryMyGirdListByLevel2AndUser`,
+          url = `/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser`,
           params = {girdMemberId}
       if (this.isApply) {
         url = `/app/appgirdinfo/listByInfo`
@@ -78,7 +78,6 @@ export default {
       }
       if (this.isMyGirds) {
         url = `/app/appgirdmemberinfo/queryMyGirdListByLevel2`
-        params = {}
       }
       this.$http.post(url, null, {params}).then((res) => {
         if (res?.data) {
diff --git a/src/project/beta/AppSpecialPeople/AppSpecialPeople.vue b/src/project/beta/AppSpecialPeople/AppSpecialPeople.vue
index 8cb5bc78..45b0ee55 100644
--- a/src/project/beta/AppSpecialPeople/AppSpecialPeople.vue
+++ b/src/project/beta/AppSpecialPeople/AppSpecialPeople.vue
@@ -8,7 +8,7 @@
       <div class="area-select">
         <div class="select-content">
           <div class="area-content fill">
-            <AiPagePicker type="custom" @select="handleGridSelect" self :ops="{url:'../AppGridManagement/SelectGird',label: 'girdName'}">
+            <AiPagePicker type="custom" @select="handleGridSelect" :self="tabIndex" :ops="{url:'../AppGridManagement/SelectGird',label: 'girdName'}">
               <AiMore v-model="gridName" placeholder="选择网格"/>
             </AiPagePicker>
           </div>

From 44d121e832a19c2b7aa442c12babee4a605348cf Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 9 Jun 2022 17:50:40 +0800
Subject: [PATCH 3/5] BUG 30116

---
 src/project/beta/AppGridManagement/AddUserSuccess.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/project/beta/AppGridManagement/AddUserSuccess.vue b/src/project/beta/AppGridManagement/AddUserSuccess.vue
index f58925e4..29083fa7 100644
--- a/src/project/beta/AppGridManagement/AddUserSuccess.vue
+++ b/src/project/beta/AppGridManagement/AddUserSuccess.vue
@@ -23,10 +23,8 @@ export default {
   },
   methods: {
     back() {
-      uni.navigateBack({
-        delta: 2, success() {
-          location.reload()
-        }
+      uni.reLaunch({
+        url: './AppGridManagement'
       })
     }
   },

From 27f2394e27a08cdbe7823c4d63387c072356fcf3 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 9 Jun 2022 17:56:57 +0800
Subject: [PATCH 4/5] BUG 30116

---
 src/project/beta/AppGridManagement/AddUserSuccess.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/project/beta/AppGridManagement/AddUserSuccess.vue b/src/project/beta/AppGridManagement/AddUserSuccess.vue
index 29083fa7..d0b88824 100644
--- a/src/project/beta/AppGridManagement/AddUserSuccess.vue
+++ b/src/project/beta/AppGridManagement/AddUserSuccess.vue
@@ -9,7 +9,10 @@
 </template>
 
 <script>
+import {mapActions} from 'vuex'
+
 export default {
+  name: "AddUserSuccess",
   data() {
     return {
       status: 1
@@ -21,10 +24,15 @@ export default {
   onLoad(option) {
     this.status = option.status
   },
+  computed: {
+    ...mapActions(['getAccount'])
+  },
   methods: {
     back() {
       uni.reLaunch({
-        url: './AppGridManagement'
+        url: './AppGridManagement', success() {
+          this.getAccount()
+        }
       })
     }
   },

From 6c978fb93159e2b2158ae851c2c9fcf5f95a888a Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 9 Jun 2022 18:02:37 +0800
Subject: [PATCH 5/5] BUG 30127

---
 src/project/beta/AppGridManagement/Map.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/project/beta/AppGridManagement/Map.vue b/src/project/beta/AppGridManagement/Map.vue
index f89e402b..2e3d6751 100644
--- a/src/project/beta/AppGridManagement/Map.vue
+++ b/src/project/beta/AppGridManagement/Map.vue
@@ -24,16 +24,12 @@
             <span class="label">网格长</span>
             <span class="value">
               {{ [item.name, item.phone].join("  ") }}
-
             </span>
           </div>
           <div v-if="form.girdMemberList && form.girdMemberList.length">
             <div class="info-flex" v-for="(item, index) in  form.girdMemberList" :key="index">
               <span class="label">网格员</span>
-              <span class="value">{{ item.name }}&nbsp;&nbsp;{{ item.phone }}
-                <img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(item.phone)" class="phone-icon"
-                     v-if="item.phone">
-              </span>
+              <span class="value">{{ item.name }}&nbsp;&nbsp;{{ item.phone }} <AiPhone :phone="item.phone"/></span>
             </div>
           </div>
         </scroll-view>