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

src/apps/AppCountryAlbum/AppCountryAlbum.vue

@@ -24,7 +24,9 @@ export default {
   },
 
   components: { Detail, List },
-
+  onShow() {
+    document.title = "乡村相册"
+  },
   methods: {
     onChange(e) {
       this.params = e.params

src/apps/AppGridManagement/AppGridManagement.vue

@@ -30,6 +30,9 @@ export default {
       this.component = e.type
     }
   },
+  onShow() {
+    document.title = "网格管理"
+  }
 }
 </script>
 

src/apps/AppMarryAndDie/AllActiveList.vue

@@ -45,14 +45,14 @@
           </div>
 
           <div class="imgs">
-            <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" />
+            <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" @click.stop="previewImage(item.files, e.url)" />
           </div>
 
           <span class="types" :style="{ background: item.type == 0 ? '#FF65B8' : item.type == 1 ? '#FF883C' : '#1AAAFF' }">
             {{ $dict.getLabel('marriageType', item.type) }}
           </span>
 
-          <span class="types" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
+          <span class="types" v-if="item.modeType" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
             {{ $dict.getLabel('modeType', item.modeType) }}
           </span>
         </template>
@@ -147,6 +147,13 @@ export default {
         }
       })
     },
+
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
   },
   onReachBottom() {
     this.current = this.current + 1

src/apps/AppMarryAndDie/AppMarryAndDie.vue

@@ -80,14 +80,14 @@
             </div>
 
             <div class="imgs">
-              <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" />
+              <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" @click.stop="previewImage(item.files, e.url)" />
             </div>
 
             <span class="types" :style="{ background: item.type == 0 ? '#FF65B8' : item.type == 1 ? '#FF883C' : '#1AAAFF' }">
               {{ $dict.getLabel('marriageType', item.type) }}
             </span>
 
-            <span class="types" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
+            <span class="types" v-if="item.modeType" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
               {{ $dict.getLabel('modeType', item.modeType) }}
             </span>
           </template>
@@ -297,6 +297,13 @@ export default {
         this.getList()
       }
     },
+
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
   },
   onReachBottom() {
     this.current = this.current + 1

src/apps/AppMarryAndDie/CadreList.vue

@@ -45,14 +45,14 @@
           </div>
 
           <div class="imgs">
-            <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" />
+            <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" @click.stop="previewImage(item.files, e.url)" />
           </div>
 
           <span class="types" :style="{ background: item.type == 0 ? '#FF65B8' : item.type == 1 ? '#FF883C' : '#1AAAFF' }">
             {{ $dict.getLabel('marriageType', item.type) }}
           </span>
 
-          <span class="types" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
+          <span class="types" v-if="item.modeType" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
             {{ $dict.getLabel('modeType', item.modeType) }}
           </span>
         </template>
@@ -147,6 +147,13 @@ export default {
         }
       })
     },
+
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
   },
   onReachBottom() {
     this.current = this.current + 1

src/apps/AppMarryAndDie/FuneralList.vue

@@ -45,14 +45,14 @@
           </div>
 
           <div class="imgs">
-            <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" />
+            <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" @click.stop="previewImage(item.files, e.url)" />
           </div>
 
           <span class="types" :style="{ background: item.type == 0 ? '#FF65B8' : item.type == 1 ? '#FF883C' : '#1AAAFF' }">
             {{ $dict.getLabel('marriageType', item.type) }}
           </span>
 
-          <span class="types" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
+          <span class="types" v-if="item.modeType" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
             {{ $dict.getLabel('modeType', item.modeType) }}
           </span>
         </template>
@@ -147,6 +147,13 @@ export default {
         }
       })
     },
+
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
   },
   onReachBottom() {
     this.current = this.current + 1

src/apps/AppMarryAndDie/MarryList.vue

@@ -45,14 +45,14 @@
           </div>
 
           <div class="imgs">
-            <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" />
+            <img :src="e.url" alt="" v-for="(e, i) in item.files" :key="i" @click.stop="previewImage(item.files, e.url)" />
           </div>
 
           <span class="types" :style="{ background: item.type == 0 ? '#FF65B8' : item.type == 1 ? '#FF883C' : '#1AAAFF' }">
             {{ $dict.getLabel('marriageType', item.type) }}
           </span>
 
-          <span class="types" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
+          <span class="types" v-if="item.modeType" :style="{ background: item.modeType == 0 ? '#42D784' : '#1AAAFF' }" style="margin-left: 16px">
             {{ $dict.getLabel('modeType', item.modeType) }}
           </span>
         </template>
@@ -147,6 +147,13 @@ export default {
         }
       })
     },
+
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
   },
   onReachBottom() {
     this.current = this.current + 1

src/apps/AppResidentActivitie/Add.vue

@@ -80,7 +80,6 @@ export default {
 
         contactPhone: '',
       },
-
       showStartTime: false,
       showEndTime: false,
       flag: false,
@@ -176,7 +175,6 @@ export default {
               content: this.forms.content,
               url: JSON.stringify(imgs) || [],
               areaId: this.forms.areaId,
-
               beginTime: this.forms.beginTime,
               endTime: this.forms.endTime,
               address: this.forms.address,
@@ -211,12 +209,7 @@ export default {
     },
 
     areaSelect(e) {
-      if (e.type == 5) {
+      this.forms.areaId = e.id
-        this.forms.areaId = e.id
-      }
-      if (e.type == 4) {
-        this.forms.areaId = e.id
-      }
     },
   },
 }

src/apps/AppResidentActivitie/AppResidentActivities.vue

@@ -32,7 +32,7 @@
             <div class="areaNmae" v-if="item.areaName || item.address">{{ item.areaName }}{{ item.address }}</div>
           </div>
 
-          <img :src="item.url[0].url" alt="" />
+          <img :src="item.url[0].url" alt="" @click.stop="previewImage(item.url, item.url[0].url)" />
 
           <div class="hints" :style="{ background: item.status == 0 ? '#000000' : item.status == 1 ? '#42D784' : '#E4E4E4' }">{{ $dict.getLabel('villageActivityStatus', item.status) }}</div>
         </template>
@@ -78,6 +78,7 @@ export default {
     this.$dict.load(['villageActivityStatus']).then(() => {
       this.getList()
     })
+
     uni.$on('updateList', () => {
       this.current = 1
       this.getList()
@@ -127,6 +128,13 @@ export default {
     toDetail(item) {
       uni.navigateTo({ url: `./Detail?id=${item.id}&createUserId=${item.createUserId}` })
     },
+
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map((v) => v.url),
+        current: img,
+      })
+    },
   },
   onReachBottom() {
     this.current = this.current + 1

src/apps/AppResidentActivitie/Detail.vue

@@ -2,7 +2,7 @@
   <div class="page">
     <div class="header-content">
       <div class="header-top">
-        <img :src="detail.url && detail.url[0].url" alt="" />
+        <img :src="detail.url && detail.url[0].url" alt="" @click.stop="previewImage(detail.url, detail.url[0].url)" />
       </div>
 
       <div class="header-middle">
@@ -15,7 +15,7 @@
           <div class="right">
             <img :src="user.avatar" alt="" v-if="user.avatar" />
 
-            <span>{{ user.name }}</span>
+            <span>{{ detail.contactPerson }}</span>
           </div>
         </div>
 
@@ -28,7 +28,6 @@
           <div class="cards-left">活动人数</div>
           <div class="cards-right" @click="toSignUser()">
             <span style="color: #1c6bdf">{{ detail.realNum }}</span>
-            <u-icon name="arrow-right" color="#DDDDDD" size="28" style="margin-left: 8px"></u-icon>
           </div>
         </div>
 
@@ -71,7 +70,7 @@
               </div>
 
               <div class="card-img">
-                <img :src="e.url" v-for="(e, i) in imgList[index]" :key="i" alt="" @click.stop="previewImage(info.images, item.url)" />
+                <img :src="e.url" v-for="(e, i) in imgList[index]" :key="i" alt="" @click.stop="previewImage(imgList[index], e.url)" />
               </div>
 
               <!-- <div class="card-icon">
@@ -102,7 +101,7 @@
       <div class="fixedBtns" v-if="this.current == 0 && detail.status == 0 && this.createUserId == this.user.id" @click="toAdd">编辑活动</div>
     </div>
 
-    <AiFixedBtn v-if="this.createUserId == this.user.id">
+    <AiFixedBtn v-if="this.createUserId == this.user.id && this.timeNow * 1 - this.timeEnd * 1 < 24 * 60 * 60 * 1000">
       <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="AddPosts()" />
     </AiFixedBtn>
   </div>
@@ -133,6 +132,8 @@ export default {
       ],
       current: 0,
       timeEndTime: '',
+      timeEnd: '',
+      timeNow: '',
     }
   },
   onLoad(option) {
@@ -154,6 +155,16 @@ export default {
       this.$http.post(`/app/appvillageactivityinfo/queryDetailById?id=${this.id}`).then((res) => {
         if (res?.data) {
           this.detail = res.data
+          console.log('结束时间', this.detail.endTime)
+          this.timeEnd = new Date(this.detail.endTime).getTime()
+          console.log('过去时间戳', this.timeEnd)
+          this.timeNow = new Date().getTime()
+          console.log('当前时间戳', this.timeNow)
+          console.log('过去时间戳加上24小时', this.timeEnd * 1 + 24 * 60 * 60 * 1000)
+
+          if (this.timeNow * 1 - this.timeEnd * 1 < 24 * 60 * 60 * 1000) {
+            console.log('可以添加')
+          }
 
           if (this.detail) {
             if (this.detail.url) {

src/apps/AppResidentDocument/DetailCard.vue

@@ -7,7 +7,8 @@
 
       <div class="areaHint">
         <u-icon name="map-fill" color="#73ABFF"></u-icon>
-        <span>{{ currentAddress }}</span>
+        <span>{{ resident.currentAreaName }}</span>
+        <span v-if="resident.currentAddress">{{ resident.currentAddress }}</span>
       </div>
     </div>
 
@@ -26,8 +27,8 @@
               <div class="rightTop-lefts">
                 <span class="names">{{ item.name }}</span>
                 <span class="fileStatuss" v-if="item.fileStatus == 1"> {{ $dict.getLabel('fileStatus', item.fileStatus) }}</span>
-
+                <span class="householdNames" v-if="item.householdName == 1">户主</span>
-                <span class="householdNames">
+                <span class="householdNames" v-else>
                   {{ $dict.getLabel('householdRelation', item.householdRelation) }}
                 </span>
               </div>
@@ -59,13 +60,13 @@ export default {
     return {
       id: '',
       data: [],
-      currentAddress: '',
+      resident: {},
     }
   },
   computed: {},
   watch: {},
   onLoad(o) {
-    document.title =  '居民档案' 
+    document.title = '居民档案'
     this.id = o.id
     this.$dict.load('householdRelation', 'fileStatus').then(() => {
       this.getDetail()
@@ -78,7 +79,7 @@ export default {
         if (res.code == 0) {
           this.data = res.data
           this.$nextTick(() => {
-            this.currentAddress = res.data.resident.currentAddress
+            this.resident = res.data.resident
           })
         }
       })

src/apps/AppResidentDocument/DetailPeople.vue

@@ -9,8 +9,8 @@
       <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">
+          <span class="householdNames" v-else>
             {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}
           </span>
         </div>
@@ -37,7 +37,7 @@
 
         <div class="item">
           <span>民族</span>
-          <span v-if="data.resident && data.resident.householdName"> {{ $dict.getLabel('nation', data.resident.householdName) }}</span>
+          <span v-if="data.resident && data.resident.nation"> {{ $dict.getLabel('nation', data.resident.nation) }}</span>
         </div>
 
         <div class="item">

src/apps/AppResidentFile/AppResidentFile.vue

@@ -129,7 +129,6 @@ export default {
           iconPath: 'home',
           selectedIconPath: 'home-fill',
           text: '统计分析',
-          isDot: true,
           customIcon: false,
         },
         {
@@ -182,7 +181,7 @@ export default {
   },
   watch: {},
   onLoad() {
-    document.title =  '居民信息管理' 
+    document.title = '居民信息管理'
     this.getEchart1()
     this.areaId = this.user.areaId
   },

src/apps/AppSpecialPeople/AppSpecialPeople.vue

@@ -29,6 +29,9 @@ export default {
     onChange(e) {
       this.params = e.params
       this.component = e.type
+    },
+    onShow() {
+      document.title = "特殊人群"
     }
   },
 }

src/apps/AppUniMsg/Add.vue

@@ -7,7 +7,7 @@
         </u-form-item>
 
         <u-form-item label="发布组织" prop="publishUnitName" required :border-bottom="false" class="phones">
-          <u-input v-model="forms.publishUnitName" placeholder="请输入发布单位" maxlength="16" />
+          <u-input v-model="forms.publishUnitName" placeholder="请输入发布组织" maxlength="16" />
         </u-form-item>
 
         <u-form-item label="正文" prop="content" :border-bottom="false" label-position="top" class="contents">

src/apps/AppWorkonline/Detail.vue

@@ -222,8 +222,6 @@
       <div class="reject" @click="agree(0)">拒绝</div>
       <div class="agree" @click="agree(1)">同意</div>
     </div>
-
-    <AiBack></AiBack>
   </div>
 </template>
 

src/apps/AppWorkonline/detail.vue

@@ -222,8 +222,6 @@
       <div class="reject" @click="agree(0)">拒绝</div>
       <div class="agree" @click="agree(1)">同意</div>
     </div>
-
-    <AiBack></AiBack>
   </div>
 </template>