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

src/apps/AppCountryAlbum/detail.vue

@@ -60,6 +60,7 @@ export default {
     console.log(this.params)
     this.getList()
     this.getStatistic()
+    uni.setNavigationBarTitle({title: '乡村相册'})
   },
 
   methods: {

src/apps/AppCountryAlbum/list.vue

@@ -38,6 +38,7 @@ export default {
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
     this.getList()
+    uni.setNavigationBarTitle({title: '乡村相册'})
   },
 
   methods: {

src/apps/AppMailList/add.vue

@@ -78,6 +78,7 @@ export default {
         this.getDetail()
       }
     })
+    uni.setNavigationBarTitle({title: '新增'})
   },
 
   methods: {

src/apps/AppMailList/list.vue

@@ -43,6 +43,7 @@ export default {
   computed: { ...mapState(['user']) },
   mounted() {
     this.getList()
+    uni.setNavigationBarTitle({title: '便民通讯录'})
   },
 
   methods: {

src/apps/AppMailList/myAddList.vue

@@ -33,8 +33,8 @@ export default {
   },
   computed: { ...mapState(['user']) },
   mounted() {
-    console.log(this.user)
     this.getList()
+    uni.setNavigationBarTitle({title: '便民通讯录'})
   },
 
   methods: {

src/apps/AppResidentDocument/AppResidentDocument.vue

@@ -2,12 +2,12 @@
   <div class="AppResidentDocument">
     <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
 
-    <!-- <AiAreaPicker v-model="areaId"  :areaId="areaId" @select="areaSelect"></AiAreaPicker> -->
+    <AiAreaPicker v-model="areaId"  :areaId="user.areaId" @select="current=1,getList"></AiAreaPicker>
 
     <div class="line"></div>
 
     <div class="seachObj">
-      <u-search v-model="keyword" :clearabled="true" placeholder="搜索" :show-action="false" bg-color="#F5F5F5" search-icon-color="#E2E8F1" color="#666" height="58" @search="handerSearch" @clear="handerClear"></u-search>
+      <u-search v-model="keyword" :clearabled="true" placeholder="姓名/联系方式/身份证后6位" :show-action="false" bg-color="#F5F5F5" search-icon-color="#E2E8F1" color="#666" height="58" @search="handerSearch" @clear="handerClear"></u-search>
     </div>
 
     <div class="datas" v-if="datas.length > 0">
@@ -72,6 +72,7 @@ export default {
         },
       ],
       currentTabs: 0,
+      areaId: ''
     }
   },
   computed: {
@@ -79,6 +80,7 @@ export default {
   },
   watch: {},
   onLoad() {
+    this.areaId = this.user.areaId
     this.getList()
   },
   onShow() {},

src/apps/AppResidentDocument/DetailCard.vue

@@ -7,27 +7,27 @@
 
       <div class="areaHint">
         <u-icon name="map-fill" color="#73ABFF"></u-icon>
-        <span>{{ currentAreaName }}</span>
+        <span>{{ currentAddress }}</span>
       </div>
     </div>
 
     <div class="bottom">
-      <div class="hints">家庭成员</div>
+      <div class="hints">家庭成员{{data.family.length}}</div>
 
       <div v-if="data.family && data.family.length > 0">
         <div class="card" v-for="(item, i) in data.family" :key="i" @click="toDetailPeople(item)">
           <div class="photos">
             <img :src="item.photo" alt="" v-if="item.photo" />
-            <img src="./components/img/2.png" alt="" v-else />
+            <img src="./components/img/44.png" alt="" v-else />
           </div>
 
           <div class="right">
             <div class="rightTop">
               <div class="rightTop-lefts">
                 <span class="names">{{ item.name }}</span>
-                <span class="householdNames" v-if="item.householdName == 1">户主</span>
+                <span class="householdNames" v-if="item.householdRelation == 1">户主</span>
                 <span class="householdNames" v-else>
-                  {{ $dict.getLabel('householdRelation', item.householdName) }}
+                  {{ $dict.getLabel('householdRelation', item.householdRelation) }}
                 </span>
               </div>
 
@@ -38,7 +38,7 @@
 
             <div class="rightBottom">
               <span>身份证号：</span>
-              <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}</span>
+              <span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1******$2') }}</span>
             </div>
           </div>
         </div>
@@ -58,7 +58,7 @@ export default {
     return {
       id: '',
       data: [],
-      currentAreaName: '',
+      currentAddress: '',
     }
   },
   computed: {},
@@ -76,7 +76,7 @@ export default {
         if (res.code == 0) {
           this.data = res.data
           this.$nextTick(() => {
-            this.currentAreaName = res.data.resident.currentAreaName
+            this.currentAddress = res.data.resident.currentAddress
           })
         }
       })

src/apps/AppResidentDocument/DetailPeople.vue

@@ -3,16 +3,16 @@
     <div class="top">
       <div class="photos">
         <img :src="data.resident.photo" alt="" v-if="data.resident.photo" />
-        <img src="./components/img/2.png" alt="" v-else />
+        <img src="./components/img/44.png" alt="" v-else />
       </div>
 
       <div class="right">
         <div class="rightTop">
           <span class="names">{{ data.resident.name }}</span>
 
-          <span class="householdNames" v-if="data.resident.name == 1">户主</span>
+          <span class="householdNames" v-if="data.resident.householdRelation == 1">户主</span>
           <span class="householdNames" v-else>
-            {{ $dict.getLabel('householdRelation', data.resident.householdName) }}
+            {{ $dict.getLabel('householdRelation', data.resident.householdRelation) }}
           </span>
         </div>
 
@@ -27,7 +27,7 @@
 
       <div class="contents">
         <div class="item">
-          <span>家庭地址</span>
+          <span>籍贯</span>
           <span>{{ data.resident.birthplaceAreaName }}</span>
         </div>
 
@@ -81,7 +81,7 @@
       <div class="contents">
         <div class="item">
           <span>联系方式</span>
-          <span class="phones">{{ data.resident.phone }}</span>
+          <span class="phones" @click="callPhone(data.resident.phone)">{{ data.resident.phone }}</span>
         </div>
 
         <div class="item">
@@ -139,6 +139,9 @@ export default {
         }
       })
     },
+    callPhone(phone) {
+      uni.makePhoneCall({ phoneNumber: phone })
+    },
   },
 }
 </script>

src/apps/AppServicePublic/Add.vue

@@ -72,6 +72,7 @@ export default {
     this.forms.areaId = this.user.areaId
     this.listName = o.listName
     this.getType()
+    uni.setNavigationBarTitle({title: this.listName})
   },
 
   mounted() {},

src/apps/AppServicePublic/AppServicePublic.vue

@@ -95,6 +95,7 @@ export default {
     uni.$on('update' , () => {
       this.getList()
     })
+    uni.setNavigationBarTitle({title: this.listName})
   },
   methods: {
     getType() {

src/apps/AppServicePublic/Detail.vue

@@ -40,6 +40,7 @@ export default {
     this.id = o.id
     this.listName = o.listName
     this.getType()
+    uni.setNavigationBarTitle({title: this.listName})
   },
   mounted() {},
   methods: {

src/apps/AppSpecialPeople/add.vue

@@ -155,6 +155,7 @@ export default {
   computed: { ...mapState(['user']) },
   created() {
     this.getType()
+    uni.setNavigationBarTitle({title: '新增人员'})
   },
 
   methods: {

src/apps/AppSpecialPeople/detail.vue

@@ -89,12 +89,12 @@ export default {
   },
   computed: { ...mapState(['user']) },
   created() {
-    console.log(1111)
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
     this.getStatistic()
     this.getStatisticMon()
     this.getUserList()
+    uni.setNavigationBarTitle({title: '特殊人群管理'})
   },
 
   methods: {

src/apps/AppUniMsg/Detail.vue

@@ -13,7 +13,7 @@
       <span class="contsnts">{{ data.content }}</span>
 
       <div class="imgs">
-        <img :src="item.url" alt="" v-for="(item, i) in data.images" :key="i" />
+        <img :src="item.url" alt="" v-for="(item, i) in data.images" :key="i" @click="previewImage(data.images, item.url)" />
       </div>
     </div>
   </div>
@@ -48,6 +48,12 @@ export default {
         }
       })
     },
+    previewImage (images, img) {
+      uni.previewImage({
+        urls: images.map(v => v.url),
+        current: img
+      })
+    },
   },
 }
 </script>

src/apps/AppVideoSurveillance/AppVideoSurveillance.vue

@@ -177,6 +177,7 @@ export default {
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
     this.getList()
+    uni.setNavigationBarTitle({title: '视频监控'})
     // this.getMonitors()
   },
   mounted() {

src/apps/AppVideoSurveillance/monitorDetail.vue

@@ -22,6 +22,7 @@ export default {
     this.$nextTick(() => {
       this.detectOrient()
     })
+    uni.setNavigationBarTitle({title: '视频监控'})
   },
 
   methods: {

src/apps/AppWorkonline/AppWorkonline.vue

@@ -150,6 +150,9 @@ export default {
   }
 
   .u-card {
+    ::v-deep .u-card__head {
+      padding: 0 !important;
+    }
     ::v-deep .u-card__body {
       .body {
         position: relative;
@@ -158,6 +161,10 @@ export default {
             font-size: 32px;
             font-weight: 500;
             margin-bottom: 16px;
+            width: 80%;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
           }
           .plan,
           .modetpye,

src/apps/AppWorkonline/Opinion.vue

@@ -56,7 +56,7 @@
         <!-- 单个文件最大10MB.zip、.rar、.doc、.docx、.xls、.xlsx、.ppt、.pptx、.pdf、.txt、.jpg、.png格式 -->
         <div class="upload">
           <div class="info">
-            <ai-uploader multiple @list="(v) => (annex = v)" :limit="9" action="/admin/file/add2" type="file" placeholder="添加文件" preview />
+            <AiUploader multiple @list="(v) => (annex = v)" :limit="9" action="/admin/file/add2" type="file" placeholder="添加文件" preview />
           </div>
         </div>
       </div>
@@ -67,7 +67,7 @@
         <text class="img_text">(最多9张)</text>
         <div class="upload">
           <div class="info">
-            <ai-uploader multiple @list="(v) => (picture = v)" :limit="9" :size="2097152" preview />
+            <AiUploader multiple @list="(v) => (picture = v)" :limit="9" :size="2097152" preview />
           </div>
         </div>
       </div>