Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppGridManagement/Map.vue

@@ -72,7 +72,13 @@ export default {
     this.areaId = this.user.areaId
     // this.getLeafNodes()
     uni.$on('goback', e => {
-      this.getGridInfo(e.id, true)
+      if (e.girdLevel == '0') {
+        setTimeout(() => {
+          this.$u.toast('请选择二级或者三级网格')
+        }, 400)
+        return false
+      }
+      this.getGridList(e.id, true)
     })
   },
   onShow() {
@@ -103,6 +109,26 @@ export default {
       })
     },
 
+    getGridList (id) {
+      this.$loading()
+      this.$http.post(`/app/appgirdinfo/queryChildGirdInfoByGirdId?girdId=${id}`).then((res) => {
+        this.$hideLoading()
+        if (res?.data) {
+          const arr = res.data.map(v => {
+            return {
+              id: v.id,
+              girdName: v.girdName,
+              points: v.points ? v.points.map(p => [p.lng, p.lat]) : []
+            }
+          })
+
+          this.renderGridMap(arr)
+        }
+      }).catch(() => {
+        this.$hideLoading()
+      })
+    },
+
     getGridInfo (id, flag) {
       this.$loading()
       this.$http.post(`/app/appgirdinfo/queryDetailById?id=${id}`).then((res) => {

src/apps/AppWalkask/add.vue

@@ -4,7 +4,7 @@
       <div class="header-description">
         <u-form :model="forms" ref="uForm" label-width="auto">
           <u-form-item label="区域选择" prop="areaId" class="areaIds" style="position: relative">
-            <AiAreaPicker v-model="forms.areaId" :areaId="areaIdProps" @select="areaSelect" style="color: #333"></AiAreaPicker>
+            <AiAreaPicker :value="forms.areaId" :areaId="areaIdProps" @select="areaSelect" style="color: #333"></AiAreaPicker>
             <u-icon name="arrow-right" color="rgb(192, 196, 204)" size="30" style="margin-left: 4px" />
           </u-form-item>
 
@@ -93,7 +93,7 @@ export default {
     this.areaIdProps = this.user.areaId
     if (!this.id) {
       this.forms.areaId = this.user.areaId
-      this.areaName = this.user.areaName
+      this.forms.areaName = this.user.areaName
     }
     this.$dict.load('realityStatus').then(() => {
       this.getDetail()
@@ -126,6 +126,8 @@ export default {
             this.forms = res.data
             this.forms.create_user_name = res.data.name
             this.forms.realityValue = res.data.reality
+            this.forms.areaId = res.data.areaId
+            this.forms.areaName = res.data.areaName
             this.forms.reality = this.$dict.getLabel('realityStatus', res.data.reality)
             if (res.data.images) {
               this.forms.images = JSON.parse(res.data.images || '[]')

src/apps/AppWalkask/detail.vue

@@ -8,7 +8,6 @@
         <span>
           {{ data.name }}
           <span class="tags" v-if="data.menuLevel3Name">{{ data.menuLevel3Name }}</span>
-          <span class="tags" v-if="data.reality">{{ $dict.getLabel('realityStatus', data.reality) }}</span>
         </span>
         
       </div>
@@ -110,7 +109,7 @@ export default {
         height: 40px;
         border-radius: 4px;
         border: 1px solid #FFFFFF;
-        margin-right: 16px;
+        margin-left: 16px;
       }
     }
   }

src/components/AiAreaPicker.vue

@@ -5,7 +5,7 @@
         <slot v-if="$slots.default"/>
         <div v-else class="areaSelector">
           <image :src="locationIcon" class="location"/>
-          <div v-text="selected.name || currentArea.name"/>
+          <div v-text="areaName"/>
         </div>
       </div>
       <div class="areaSelector">
@@ -18,7 +18,7 @@
           </div>
           <div/>
           <span v-if="all" v-text="`省`" @click="selectNode({}, -1)"/>
-          <span v-for="(area,i) in fullArea" :key="area.id" v-text="area.levelLabel"
+          <span v-for="(area,i) in fullArea" :key="area.id" v-text="area.levelLabel || '村/社区'"
                 @click="selectNode(area, i)"/>
         </div>
         <!--用来作为占位的-->
@@ -90,6 +90,7 @@ export default {
     return {
       fullArea: [],
       index: '',
+      areaName: '',
       list: [],
       levelLabels: ["省", "市", "县/区", "镇/街道", "村/社区"],
       selected: {},
@@ -101,10 +102,18 @@ export default {
       v && (this.getFullArea())
     },
 
+    value (v) {
+      if (this.list.length && v) {
+        this.areaName = this.list.find((e) => e.id ==  this.value).name
+      }
+    },
+
     fullArea: {
       handler(v) {
         this.$nextTick(() => {
+          if (v) {
             this.scrollHeight()
+          }
         })
       }
     }
@@ -118,7 +127,7 @@ export default {
       this.$refs.areaSelector.showPopup()
     },
     scrollHeight () {
-      return this.height = `calc(100% - ${document.querySelector('.areaSelector').offsetHeight}px)`
+      return this.height = document.querySelector('.areaSelector') && `calc(100% - ${document.querySelector('.areaSelector').offsetHeight}px)`
     },
     getFullArea() {
       let areaId = this.areaId || (this.all ? '' : this.$areaId)
@@ -134,8 +143,8 @@ export default {
             this.fullArea = res.data.reverse().slice(this.dataRange)
           } else {
             this.fullArea = res.data
-          }
 
+          }
           return this.fullArea
         }
       })
@@ -148,10 +157,26 @@ export default {
         if (res.data.length) {
           this.list = res.data
           let self = this.fullArea.find((e) => e.id ==  this.areaId)
+          
+          if (this.value && !this.areaName && this.value !== this.areaId) {
+            this.areaName = this.list.find((e) => e.id ==  this.value).name
+          }
+          
+          if (!this.areaName && this.value === this.areaId) {
+            this.areaName = self.name
+          }
           if (self.id) {
             this.list.unshift(self)
           }
           this.scrollHeight()
+        } else {
+          if (this.areaId.substr(this.areaId.length - 3, 3) !== '000') {
+            this.list = [{
+              id: this.areaId,
+              name: this.fullArea[0].name
+            }]
+            this.areaName = this.fullArea[0].name
+          }
         }
       })
     },
@@ -171,10 +196,11 @@ export default {
       })
 
       if (this.selected.type == 5) {
-        fullName = fullName + this.selected.name
+        fullName = fullName + (this.selected.name || this.areaName)
       }
+      this.areaName = this.selected.name || this.areaName
       this.$emit('update:fullName', fullName)
-      this.$emit('update:name', this.selected.name)
+      this.$emit('update:name', (this.selected.name || this.areaName))
       this.closePopup()
     },
     getChild(op) {
@@ -210,7 +236,6 @@ export default {
 
         return false
       }
-      console.log(this.index)
       this.getFullArea().then(() => {
         this.getChildAreas(this.currentArea.id || this.areaId)
       })

src/store/index.js

@@ -356,7 +356,7 @@ const store = new Vuex.Store({
         state.dispatch("injectJWeixin", "selectPrivilegedContact").then(() => {
           setTimeout(() => {
             let sdk = typeof wx?.invoke == 'function' ? wx : jWeixin
-            sdk?.invoke("selectEnterpriseContact", {
+            sdk?.invoke("selectPrivilegedContact", {
               fromDepartmentId: -1,
               selectedContextContact: 1,
               mode: "multi",