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

src/apps/AppMailList/AppMailList.vue

@@ -46,7 +46,10 @@ export default {
   },
   computed: { ...mapState(['user']) },
   mounted() {
-    // this.getList()
+    this.getList()
+    uni.$on('updateList', () => {
+      this.getList()
+    })
   },
   onShow() {
     document.title = "便民通讯录"

src/apps/AppMailList/add.vue

@@ -30,7 +30,7 @@
       <div class="item">
         <span class="label"><span class="tips">*</span>地区</span>
         <div class="value">
-          <AiAreaPicker :areaId="user.areaId" v-model="userInfo.areaId" @select="areaSelect">
+          <AiAreaPicker :areaId="user.areaId" v-model="userInfo.areaId" :name.sync="userInfo.areaName" @select="areaSelect">
             <span class="label" v-if="userInfo.areaName">{{ userInfo.areaName }}</span>
             <span v-else class="color-999">请选择</span>
             <u-icon name="arrow-right" color="#cccccc" size="14"></u-icon>
@@ -85,8 +85,7 @@ export default {
 
   methods: {
     areaSelect(e) {
-      this.userInfo.areaId = e.id
+      this.userInfo.areaId = e
-      this.userInfo.areaName = e.name
     },
     confirmSelect(e) {
       this.userInfo.isPublic = e[0].value

src/apps/AppMarryAndDie/AppMarryAndDie.vue

@@ -331,6 +331,7 @@ uni-page-body {
 
   .msg {
     background: #fff;
+    height: 100%;
 
     .box {
       display: flex;
@@ -396,11 +397,12 @@ uni-page-body {
   }
 
   .myReport {
-    background: #f3f6f9;
+    background: #f5f5f5 !important;
-    padding-bottom: 112px;
+    height: 100%;
 
     ::v-deep .AiCard {
       background: #f3f6f9;
+      padding: 0 24px 24px 24px;
 
       .start {
         display: flex;
@@ -477,8 +479,12 @@ uni-page-body {
       }
     }
 
+    ::v-deep .AiCard:first-child {
+      padding-top: 24px;
+    }
+
     .emptyWrap {
-      background: #f3f6f9;
+      background: #f5f5f5 !important;
     }
 
     .u-load-more-wrap {

src/apps/AppResidentActivitie/Add.vue

@@ -330,7 +330,7 @@ export default {
     font-size: 32px;
     font-weight: 500;
     color: #ffffff;
-    z-index: 999999;
+    z-index: 99;
   }
 }
 </style>

src/apps/AppResidentActivitie/AppResidentActivities.vue

@@ -39,6 +39,8 @@
       </AiCard>
     </template>
 
+    <AiEmpty description="暂无数据" v-else></AiEmpty>
+
     <AiFixedBtn>
       <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="toAdd()" />
     </AiFixedBtn>

src/apps/AppResidentDocument/DetailPeople.vue

@@ -9,7 +9,7 @@
       <div class="right">
         <div class="rightTop">
           <span class="names">{{ data.resident && data.resident.name }}</span>
-          <span class="householdNames" v-if="data.resident.householdName == 1">户主</span>
+          <span class="householdNames" v-if="data.resident && data.resident.householdName == 1">户主</span>
           <span class="householdNames" v-else>
             {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}
           </span>

src/apps/AppResidentFile/components/document.vue

@@ -82,6 +82,11 @@ export default {
       familyList: [],
     }
   },
+  created() {
+    console.log('居民档案性别(无字典)', this.resident.sex)
+    console.log('居民档案性别(有字典)', this.$dict.getLabel('sex', this.resident.sex))
+    console.log('居民档案字典值', this.$dict.getDict('sex'))
+  },
   onShow() {
     document.title = '居民详情'
     this.$dict.load('sex', 'nation', 'education', 'job', 'faithType', 'politicsStatus', 'militaryStatus', 'householdRelation', 'householdName')

src/apps/AppServicePublic/Add.vue

@@ -149,7 +149,6 @@ export default {
         contentType: 0
       })
       .then((res) => {
-        console.log(333)
         if (res.code == 0) {
           uni.$emit('update')
           this.$u.toast('发布成功')
@@ -162,7 +161,7 @@ export default {
     },
 
     areaSelect(e) {
-      this.forms.areaId = e.id
+      this.forms.areaId = e
     },
 
     selectStatus(e) {
@@ -217,7 +216,7 @@ export default {
     font-size: 32px;
     font-weight: 500;
     color: #ffffff;
-    z-index: 999999;
+    z-index: 9999;
   }
 
   .right {

src/apps/AppServicePublic/AppServicePublic.vue

@@ -105,6 +105,7 @@ export default {
     this.getType()
     this.getList()
     uni.$on('update', () => {
+      this.current = 1
       this.getList()
     })
 

src/apps/AppUniMsg/Add.vue

@@ -51,7 +51,7 @@ export default {
     this.getDetail()
   },
   onShow() {
-    document.title = '新增通知公告'
+    document.title = '新增小程序公告'
   },
 
   mounted() {

src/apps/AppUniMsg/AppUniMsg.vue

@@ -24,7 +24,7 @@
           </div>
         </template>
 
-        <template #menu>
+        <template #menu v-if="item.createUserId == user.id">
           <div class="menu" @tap.stop="toAdd(item, 2)">编辑</div>
           <div class="menu" @tap.stop="toDetele(item)">删除</div>
         </template>
@@ -85,7 +85,7 @@ export default {
     })
   },
   onShow() {
-    document.title = '通知公告'
+    document.title = '小程序公告'
   },
   methods: {
     getList() {
@@ -145,6 +145,7 @@ export default {
     },
 
     change(index) {
+      this.datas = []
       this.currentTabs = index
       this.getList()
     },

src/apps/AppUniMsg/Detail.vue

@@ -33,7 +33,7 @@ export default {
   computed: {},
   watch: {},
   onLoad(o) {
-    document.title = '公告详情' 
+    document.title = '小程序公告详情'
     this.id = o.id
     this.getDetail()
   },

src/apps/AppWalkask/detail.vue

@@ -5,7 +5,7 @@
 
       <div class="walk-item">
         <span>走访对象：</span>
-        <span>{{ data.createUserName }}</span>
+        <span>{{ data.name }}</span>
       </div>
 
       <div class="walk-item" v-if="data.reality">
@@ -28,7 +28,7 @@
       <div class="hint-con" v-if="data.description">{{ data.description }}</div>
 
       <div class="imgs">
-        <img :src="item.url" alt="" v-for="(item, index) in data.images" :key="index" />
+        <img :src="item.url" alt="" v-for="(item, index) in data.images" :key="index" @click.stop="previewImage(data.images, item.url)" />
       </div>
     </div>
   </div>
@@ -69,6 +69,13 @@ export default {
         }
       })
     },
+
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
   },
 }
 </script>

src/apps/AppWorkonline/Opinion.vue

@@ -65,8 +65,8 @@
       <div class="reply_img">
         <text class="img">图片资料</text>
         <text class="img_text">(最多9张)</text>
-        <div class="upload">
+        <div class="uploads">
-          <div class="info">
+          <div class="infos">
             <AiUploader multiple @list="(v) => (picture = v)" :limit="9" action="/admin/file/add2" preview />
           </div>
         </div>
@@ -324,7 +324,11 @@ export default {
         ::v-deep .info > span {
           width: 380px;
           text-align: left;
-          //  word-break: break-all;
+          word-break: break-all;
+
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
         }
 
         ::v-deep .ai-uploader .fileList .default {
@@ -352,13 +356,13 @@ export default {
         margin-left: 10px;
       }
 
-      .upload {
+      .uploads {
         width: 100%;
         margin-top: 10px;
         padding: 12px 12px 12px 0;
         box-sizing: border-box;
 
-        .info {
+        .infos {
           width: 100%;
           text-align: center;
         }