From a228eededc6954ef297c7aae7a69541af2620a69 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 15 Mar 2022 18:15:04 +0800
Subject: [PATCH 1/3] BUG 27433

---
 src/saas/AppConflictMediation/Content.vue    |  7 +-
 src/saas/AppConflictMediation/SelectUser.vue | 76 ++++++++++++--------
 2 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/src/saas/AppConflictMediation/Content.vue b/src/saas/AppConflictMediation/Content.vue
index c73228ee..8ecdca0f 100644
--- a/src/saas/AppConflictMediation/Content.vue
+++ b/src/saas/AppConflictMediation/Content.vue
@@ -51,6 +51,8 @@
 </template>
 
 <script>
+import qs from 'query-string'
+
 export default {
   name: 'Content',
   components: {},
@@ -92,7 +94,6 @@ export default {
     document.title = this.titleList[this.status]
   },
   methods: {
-
     typeList() {
       this.$http.post(`/app/appclapeventgroup/list`, null, {
         params: {
@@ -106,7 +107,6 @@ export default {
         }
       })
     },
-
     confirm() {
       if (this.status == 4 && !this.forms.name) {
         return this.$u.toast('请选择转交对象')
@@ -161,7 +161,8 @@ export default {
       this.forms.groupId = e[0].value
     },
     toSelectUser() {
-      uni.navigateTo({url: './SelectUser'})
+      let {id} = this.selectUser
+      uni.navigateTo({url: qs.stringifyUrl({url: './SelectUser', query: {id}})})
     },
   },
 }
diff --git a/src/saas/AppConflictMediation/SelectUser.vue b/src/saas/AppConflictMediation/SelectUser.vue
index 3b2dabfb..cb02595a 100644
--- a/src/saas/AppConflictMediation/SelectUser.vue
+++ b/src/saas/AppConflictMediation/SelectUser.vue
@@ -2,7 +2,8 @@
   <div class="SelectUser">
     <div class="header-middle">
       <div class="hint">
-        <span v-for="(item, index) in slectList" :key="index"><span v-if="index" style="margin:0 4px;">/</span><span style="color:#3F8DF5" @click="girdNameClick(item, index)">{{item.girdName}}</span></span>
+        <span v-for="(item, index) in slectList" :key="index"><span v-if="index" style="margin:0 4px;">/</span><span
+            style="color:#3F8DF5" @click="girdNameClick(item, index)">{{ item.girdName }}</span></span>
       </div>
 
       <div class="showTypes" v-if="!userList.length">
@@ -11,14 +12,16 @@
             <div class="imges">
               <span v-if="item.girdLevel == 1" style="width: 24px;"></span>
               <span v-if="item.girdLevel == 2">
-                <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="item.isChecked" @click.stop="girdClick(item, index)" />
-                <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click.stop="girdClick(item, index)" />
+                <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
+                     @click.stop="girdClick(item, index)"/>
+                <img src="./components/img/xz.png" alt="" class="imgselect" v-else
+                     @click.stop="girdClick(item, index)"/>
               </span>
-              <img src="./components/img/gird--select-icon.png" alt="" class="avatras" />
+              <img src="./components/img/gird--select-icon.png" alt="" class="avatras"/>
             </div>
             <div class="rightes">
               <div class="applicationNames">{{ item.girdName }}</div>
-              <img src="./components/img/right-icon.png" alt="" class="imgs" />
+              <img src="./components/img/right-icon.png" alt="" class="imgs"/>
             </div>
           </div>
         </div>
@@ -30,14 +33,17 @@
         <div v-if="userList.length > 0">
           <div class="cards" v-for="(e, index) in userList" :key="index">
             <div class="imges">
-              <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="e.isChecked" @click="userClick(e, index)" />
-              <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click="userClick(e, index)" />
+              <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="e.isChecked"
+                   @click="userClick(e, index)"/>
+              <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click="userClick(e, index)"/>
 
-              <img src="./components/img/tx@2x.png" alt="" class="avatras" />
+              <img src="./components/img/tx@2x.png" alt="" class="avatras"/>
             </div>
 
             <div class="rights">
-              <div class="applicationNames"><AiOpenData v-if="e.name" type="userName" :openid="e.name" style="display: block;"/></div>
+              <div class="applicationNames">
+                <AiOpenData v-if="e.name" type="userName" :openid="e.name" style="display: block;"/>
+              </div>
               <div class="idNumbers">{{ e.phone }}</div>
             </div>
           </div>
@@ -67,6 +73,7 @@ export default {
     }
   },
   onLoad() {
+    this.selectUser.id = this.$route.query.id
     this.getTree()
   },
   onShow() {
@@ -84,14 +91,14 @@ export default {
     },
 
     treeInit() {
-      if(this.allData[0].girdLevel == 2) {
-        if(this.allData[0].girdMemberList && this.allData[0].girdMemberList.length) {
-            this.userList = this.allData[0].girdMemberList
-            this.userList.map((item) => {
-            item.isChecked = false
+      if (this.allData[0].girdLevel == 2) {
+        if (this.allData[0].girdMemberList && this.allData[0].girdMemberList.length) {
+          this.userList = this.allData[0].girdMemberList
+          this.userList.map((item) => {
+            item.isChecked = item.id == this.selectUser.id
           })
         }
-      }else {
+      } else {
         this.treeList = this.allData[0].girdList
       }
       var obj = {
@@ -114,19 +121,19 @@ export default {
 
     searckGird(row) {
       this.treeList = []
-      if(row.girdLevel != 2) { //查网格
+      if (row.girdLevel != 2) { //查网格
         this.$http.post(`/app/appgirdinfo/list?parentGirdId=${row.id}&size=999`).then((res) => {
           if (res?.data) {
-            this.treeList = res.data.records
+            this.treeList = res.data.records.map(e => ({...e, isChecked: e.id == this.selectUser.id}))
           }
         })
-      }else { //查网格员
+      } else { //查网格员
         this.userList = []
         this.$http.post(`/app/appgirdmemberinfo/listByGirdIdByThree?girdId=${row.id}`).then((res) => {
           if (res?.data) {
             this.userList = res.data
             this.userList.map((item) => {
-              item.isChecked = false
+              item.isChecked = item.id == this.selectUser.id
             })
           }
         })
@@ -135,13 +142,13 @@ export default {
 
     girdNameClick(row, index) {
       this.userList = []
-      if(!index) { //第一级别
+      if (!index) { //第一级别
         this.slectList = []
         this.treeInit()
-      }else {
+      } else {
         var list = []
         this.slectList.map((item, i) => {
-          if(i <= index) {
+          if (i <= index) {
             list.push(item)
           }
         })
@@ -149,17 +156,16 @@ export default {
         this.searckGird(row)
       }
     },
-    
+
 
     girdClick(row, index) {
       if (this.treeList[index].isChecked) {//取消
         this.treeList[index].isChecked = false
         this.selectUser = {}
       } else {
-        this.treeList.map((item) => {
-          item.isChecked = false
+        this.treeList.map((item, i) => {
+          item.isChecked = index == i
         })
-        this.treeList[index].isChecked = true
         this.selectUser = row
       }
       this.$forceUpdate()
@@ -170,10 +176,9 @@ export default {
         this.userList[index].isChecked = false
         this.selectUser = {}
       } else {
-        this.userList.map((item) => {
-          item.isChecked = false
+        this.userList.map((item, i) => {
+          item.isChecked = index == i
         })
-        this.userList[index].isChecked = true
         this.selectUser = row
       }
       this.$forceUpdate()
@@ -182,7 +187,7 @@ export default {
     submit() {
       if (this.selectUser.id != null) {
         uni.$emit('goback', this.selectUser)
-        uni.navigateBack()
+        uni.navigateBack({})
       } else {
         return this.$u.toast('请选择网格或网格员')
       }
@@ -195,6 +200,7 @@ export default {
 .SelectUser {
   height: 100%;
   background: #fff;
+
   .header-top {
     background: #fff;
     padding: 20px 32px;
@@ -202,10 +208,11 @@ export default {
 
   .header-middle {
     padding-bottom: 140px;
+
     .hint {
       padding: 28px 20px 28px 32px;
       line-height: 56px;
-      box-shadow: 0px 1px 0px 0px #e4e5e6;
+      box-shadow: 0 1px 0 0 #e4e5e6;
       font-size: 30px;
       font-weight: 500;
       // word-break: break-all;
@@ -244,11 +251,13 @@ export default {
             margin-left: 36px;
           }
         }
+
         img {
           width: 74px;
           height: 74px;
           border-radius: 8px;
         }
+
         .rightes {
           width: calc(100% - 160px);
           display: flex;
@@ -265,6 +274,7 @@ export default {
             white-space: nowrap;
             text-overflow: ellipsis;
           }
+
           .imgs {
             width: 40px;
             height: 40px;
@@ -286,6 +296,7 @@ export default {
           display: flex;
           align-items: center;
           width: 200px;
+
           .imgselect {
             width: 48px;
             height: 48px;
@@ -307,6 +318,7 @@ export default {
           margin-left: 32px;
           border-bottom: 1px solid #e4e5e6;
           padding-right: 40px;
+
           .applicationNames {
             font-size: 36px;
             font-weight: 500;
@@ -315,6 +327,7 @@ export default {
             white-space: nowrap;
             text-overflow: ellipsis;
           }
+
           .idNumbers {
             color: #666;
           }
@@ -330,6 +343,7 @@ export default {
     width: 100%;
     height: 118px;
     background: #f4f8fb;
+
     div {
       width: 192px;
       height: 80px;

From 80552a458e3973f672f8688b48d31aa9607bbd82 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 15 Mar 2022 18:54:01 +0800
Subject: [PATCH 2/3] BUG 27449

---
 src/saas/AppBuilding/map.vue | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/saas/AppBuilding/map.vue b/src/saas/AppBuilding/map.vue
index f03de05c..3937432e 100644
--- a/src/saas/AppBuilding/map.vue
+++ b/src/saas/AppBuilding/map.vue
@@ -8,8 +8,7 @@
       当前<br>位置
     </div> -->
     <div class="map-content">
-      <AiTMap v-if="user.areaId" :areaId="user.areaId" :map.sync="map" :lib.sync="lib" :ops="ops"
-              :libraries="['service', 'tools']"/>
+      <AiTMap :map.sync="map" :lib.sync="lib" :ops="ops" :libraries="['service', 'tools']"/>
     </div>
     <div class="footer">
       <div class="btn" @click="confirm">确认定位</div>
@@ -63,10 +62,9 @@ export default {
       markerLayer: '',
       isFlag: false,
       latLng: {lat: '', lng: ''},
-      retryTimes: 0
     }
   },
-  computed: {...mapState(['user',])},
+  computed: {...mapState(['user'])},
   mounted() {
     this.initMap()
   },
@@ -74,36 +72,33 @@ export default {
     document.title = "楼栋定位"
   },
   methods: {
-    initMap() {  //初始化地图
+    initMap(retryTimes = 0) {  //初始化地图
       this.$nextTick(() => {
-        let {map, retryTimes} = this
+        let {map} = this
         if (map) {
           map.setZoom(15)
           map.on("click", (evt) => {
             this.handleMapClick(evt)
           });
         } else {
-          if (retryTimes < 5)
+          if (retryTimes < 10)
             setTimeout(() => {
-              this.retryTimes++
-              this.initMap()
-            }, 1000)
+              this.initMap(++retryTimes)
+            }, 500)
+          else console.error("地图渲染失败")
         }
       })
     },
     getLocale() {
-      
       wx.getLocation({
         type: 'gcj02',
         success: res => {
-          console.log(res)
           let {latitude: lat, longitude: lng} = res
           this.handleMapClick({latlng: {lat, lng}})
         }
       })
     },
     handleMapClick(evt) {
-      console.log(evt.latLng)
       let {lib: TMap, map} = this
       if (this.markerLayer) {
         this.markerLayer.setMap(null);

From e685f456c1840ec57ca32941bd8ea6fad3232bab Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 15 Mar 2022 19:10:17 +0800
Subject: [PATCH 3/3] BUG 27475

---
 src/saas/AppAskForm/AppForm.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/saas/AppAskForm/AppForm.vue b/src/saas/AppAskForm/AppForm.vue
index 3b10e7fe..a49627cd 100644
--- a/src/saas/AppAskForm/AppForm.vue
+++ b/src/saas/AppAskForm/AppForm.vue
@@ -44,6 +44,7 @@ export default {
       let {corpId, code, suiteId, id} = this.$route.query
       if (this.isPreview) {
         this.access = true
+      } else if (this.access) {
       } else if (!!this.token) {
         this.$http.post("/app/appquestionnairetemplate/commitCheck", null, {
           params: {id}
@@ -65,12 +66,10 @@ export default {
       } else this.getCode()
     },
   },
-  created() {
-    this.checkAccess()
-  },
   onShow() {
     document.title = '问卷调查'
     wx.hideOptionMenu()
+    this.checkAccess()
   },
 }
 </script>