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

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,11 +24,14 @@ export default {
   onLoad(option) {
     this.status = option.status
   },
+  computed: {
+    ...mapActions(['getAccount'])
+  },
   methods: {
     back() {
-      uni.navigateBack({
+      uni.reLaunch({
-        delta: 2, success() {
+        url: './AppGridManagement', success() {
-          location.reload()
+          this.getAccount()
         }
       })
     }

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 }}
+              <span class="value">{{ item.name }}&nbsp;&nbsp;{{ item.phone }} <AiPhone :phone="item.phone"/></span>
-                <img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(item.phone)" class="phone-icon"
-                     v-if="item.phone">
-              </span>
             </div>
           </div>
         </scroll-view>

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,15 +70,14 @@ export default {
     getAllGrids() {
       this.slectList = []
       let {girdMemberId} = this.user,
-          url = `/app/appgirdinfo/queryAppGirdInfoByGirdLevel`,
+          url = `/app/appgirdmemberinfo/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) => {
         if (res?.data) {
@@ -145,7 +144,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)

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>