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

src/saas/AppAskForm/Statistical.vue

@@ -44,8 +44,8 @@
             <image src="./components/img/user-icon.png" />
             <div class="right">
               <div class="right-top">
-                <h2>{{ item.nickName }}</h2>
-                <!-- <span>{{ $dict.getLabel('wxUserType', item.userType) }}</span> -->
+                <h2 v-if="item.userType === 'wxuser'">{{ item.nickName }}</h2>
+                <AiOpenData v-else type="userName" :openid="item.nickName"/>
               </div>
               <p>{{ item.commitTime }}</p>
             </div>

src/saas/AppBuilding/add.vue

@@ -114,7 +114,7 @@
       <div class="btn">保存</div>
     </div>
 
-    <u-picker mode="time" v-model="dateShow" :params="deteParams" start-year="2010" @confirm="dateConfirm">请选择
+    <u-picker mode="time" v-model="dateShow" :params="deteParams" start-year="1900" @confirm="dateConfirm">请选择
     </u-picker>
     <u-select v-model="showSelect" :list="selectList" label-name="dictName" value-name="dictValue"
               @confirm="confirmSelect"/>
@@ -175,6 +175,7 @@ export default {
       this.$http.post(`app/appcommunityhouseinfo/update`, this.houseInfo).then(res => {
         if (res?.code == 0) {
           this.$u.toast('提交成功')
+          uni.$emit('changeHouseInfo')
           setTimeout(() => {
             uni.navigateBack({})
           }, 600)

src/saas/AppBuilding/components/searchMap.vue

@@ -150,7 +150,6 @@ export default {
         params: {
           current: 1,
           size: 1000000,
-          areaId: this.user.areaId
         }
       }).then(res => {
         if (res?.data) {
@@ -299,7 +298,6 @@ export default {
         params: {
           current: 1,
           size: 20,
-          areaId: this.user.areaId,
           name: this.name
         }
       }).then(res => {

src/saas/AppBuilding/detail.vue

@@ -168,6 +168,9 @@ export default {
     this.$dict.load('householdRelation', 'houselivingStatus', 'houseLeaseSituation', 'houseUseStatus',
         'isFilingCertificateStatus', 'communityBuildingType', 'yesOrNo', 'BulidResidentType')
     this.getBuilding()
+    uni.$on('changeHouseInfo', res => {
+      this.getHouseDetail(this.houseInfo.id)
+    })
   },
   methods: {
     getSelectList(communityId) {

src/saas/AppConflictMediation/Content.vue

@@ -16,9 +16,7 @@
           <u-input v-model="forms.content" :placeholder="status == 2 ? '请写下你的办结意见…' : '请写下你的办理意见...'" type="textarea" auto-height height="100" maxlength="500" />
         </u-form-item>
 
-        <u-form-item>
-          <span class="limit">{{ forms.content.length }}/200</span>
-        </u-form-item>
+        <div class="limit">{{ forms.content.length }}/200</div>
         
         <div class="line"></div>
 
@@ -209,10 +207,13 @@ export default {
   }
 
   .limit {
-    position: fixed;
-    right: 44px;
-    font-size: 15px;
-  }
+      text-align: right !important;
+      font-size: 16px;
+      background: #FFFFFF;
+      padding-right: 44px;
+      height: 60px;
+      line-height: 60px;
+    }
 
   .btn {
     position: fixed;

src/saas/AppConflictMediation/add.vue

@@ -23,7 +23,8 @@
             <span>(最多9张)</span>
           </div>
           <div class="form-item__right">
-            <AiUploader :def.sync="form.files" :limit="9"  action="/admin/file/add2"></AiUploader>
+            <!-- <AiUploader :def.sync="form.files" :limit="9"  action="/admin/file/add2"></AiUploader> -->
+            <AiUploader :def.sync="form.files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
           </div>
         </div>
       </div>
@@ -110,7 +111,8 @@
               <span>(最多9张)</span>
             </div>
             <div class="form-item__right">
-              <AiUploader :def.sync="form.resultFiles" :limit="9" action="/admin/file/add2"></AiUploader>
+              <!-- <AiUploader :def.sync="form.resultFiles"  :limit="9" action="/admin/file/add2"></AiUploader> -->
+              <AiUploader :def.sync="forms.resultFiles" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
             </div>
           </div>
         </div>
@@ -282,8 +284,7 @@
     }
 
     .limit {
-      position: fixed;
-      right: 44px;
+      text-align: right;
       font-size: 16px;
     }
 

src/saas/AppGridManagement/Map.vue

@@ -26,18 +26,22 @@
           <div v-if="form.girdMemberManageList && form.girdMemberManageList.length">
             <div class="info-flex" v-for="(item, index) in  form.girdMemberManageList" :key="index">
               <span class="label">网格长</span>
-              <span class="value">{{ item.name }}&nbsp;&nbsp;{{ item.phone }}
+              <span class="value">
+                <AiOpenData v-if="item.name" type="userName" :openid="item.name" />
+                <!-- &nbsp;&nbsp;{{ item.phone }}
                 <img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(item.phone)" class="phone-icon"
-                     v-if="item.phone">
+                     v-if="item.phone"> -->
               </span>
             </div>
           </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">
+                <AiOpenData v-if="item.name" type="userName" :openid="item.name" />
+                <!-- &nbsp;&nbsp;{{ item.phone }}
                 <img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(item.phone)" class="phone-icon"
-                     v-if="item.phone">
+                     v-if="item.phone"> -->
               </span>
             </div>
           </div>
@@ -133,7 +137,12 @@ export default {
               }
             }
           })
-          this.renderGridMap(arr)
+
+          if (!arr.filter(v => v.points).length) {
+            return this.$u.toast('该网格还未标会')
+          }
+
+          this.renderGridMap(arr.filter(v => v.points))
         }
       }).catch(() => {
         this.$hideLoading()
@@ -167,7 +176,6 @@ export default {
     },
 
     renderGridMap(paths, count = 0) {
-      console.log(paths)
       let {map, lib: TMap, $refs: {AiTMap: {fitBounds}}} = this
       if (TMap) {
         if(this.latLngCenter.length) {

src/saas/AppMailList/myAddList.vue

@@ -16,9 +16,11 @@
     </div>
     <div class="empty" v-else>
       <img src="./img/empty.png" alt="">
-      <p>您还未添加通讯录<br/>点击<span @click="edit('')">新增按钮</span>试试吧</p>
+      <p>您还未添加通讯录
+        <!-- <br/>点击<span @click="edit('')">新增按钮</span>试试吧 -->
+      </p>
     </div>
-    <div class="footer-btn" @click="edit('')">新增</div>
+    <!-- <div class="footer-btn" @click="edit('')">新增</div> -->
   </div>
 </template>