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

# Conflicts: # src/apps/AppBuilding/components/searchMap.vue
2021-12-24 16:20:28 +08:00
parent 4d6ff0db6f f264888b15
commit 20c26f8cae
68 changed files with 214 additions and 108 deletions
--- a/src/apps/AppActive/AddActive.vue
+++ b/src/apps/AppActive/AddActive.vue
@@ -204,7 +204,6 @@ export default {
      this.getTopicList()
      console.log(option)
      if (option.id) {
-        document.title = '编辑活动' 
        this.params.id = option.id
        this.getDetail()
      } else {
@@ -216,6 +215,9 @@ export default {
    this.startYear = date.getFullYear()
    this.getEstates()
  },
+  onShow() {
+    document.title = '编辑活动' 
+  },
  methods: {
    getEstates() {
      this.$http.post(`/app/appvanguardcommunityinfo/getTree?type=1&areaId=${this.global.areaId}`).then((res) => {
--- a/src/apps/AppAskForm/AppForm.vue
+++ b/src/apps/AppAskForm/AppForm.vue
@@ -67,8 +67,10 @@ export default {
  },
  created() {
    this.checkAccess()
-    document.title = "问卷调查"
-  }
+  },
+  onShow() {
+    document.title = '问卷调查' 
+  },
 }
 </script>

--- a/src/apps/AppBroadcast/AppBroadcast.vue
+++ b/src/apps/AppBroadcast/AppBroadcast.vue
@@ -31,7 +31,7 @@
 <script>
 export default {
  name: "AppBroadcast",
-  appName: "广播通知",
+  appName: "云广播",
  data() {
    return {
      bannerList: [
@@ -70,9 +70,9 @@ export default {
      uni.navigateTo({url})
    }
  },
-  mounted() {
-   document.title =  '云广播'
-  }
+  onShow() {
+    document.title = '云广播' 
+  },
 }
 </script>
 <style lang="scss" scoped>
--- a/src/apps/AppBroadcast/addPlay.vue
+++ b/src/apps/AppBroadcast/addPlay.vue
@@ -174,7 +174,9 @@ export default {
      this.formData.mediaId = e.mediaId
      this.formData.mediaName = e.mediaName
    })
-    document.title = '音频播放'
+  },
+  onShow() {
+    document.title = '音频播放' 
  },

  methods: {
--- a/src/apps/AppBroadcast/onlineList.vue
+++ b/src/apps/AppBroadcast/onlineList.vue
@@ -45,8 +45,10 @@ export default {
  },
  created() {
    this.getList()
-    document.title =  '在线设备'
-  }
+  },
+  onShow() {
+    document.title = '在线设备' 
+  },
 }
 </script>
 <style lang="scss" scoped>
--- a/src/apps/AppBroadcast/onlinePlayList.vue
+++ b/src/apps/AppBroadcast/onlinePlayList.vue
@@ -47,8 +47,10 @@ export default {
  },
  created() {
    this.getList()
-    document.title =  '在线设备'
-  }
+  },
+  onShow() {
+    document.title = '在播设备' 
+  },
 }
 </script>
 <style lang="scss" scoped>
--- a/src/apps/AppBroadcast/playList.vue
+++ b/src/apps/AppBroadcast/playList.vue
@@ -65,8 +65,10 @@ export default {
    this.$dict.load('dlbBroadcastStatus').then(() => {
      this.getList()
    })
-    document.title =  '在播设备'
-  }
+  },
+  onShow() {
+    document.title = '播放记录' 
+  },
 }
 </script>
 <style lang="scss" scoped>
--- a/src/apps/AppBuilding/AppBuilding.vue
+++ b/src/apps/AppBuilding/AppBuilding.vue
@@ -25,10 +25,8 @@ export default {
    this.$nextTick(() => {
      this.show = true
    })
-  },
-  mounted() {
    document.title = "以房找人"
-  }
+  },
 }
 </script>

--- a/src/apps/AppBuilding/add.vue
+++ b/src/apps/AppBuilding/add.vue
@@ -148,7 +148,9 @@ export default {
        'isFilingCertificateStatus', 'communityBuildingType', 'yesOrNo', 'BulidResidentType').then(() => {
      this.getDetail()
    })
-     document.title =  '房屋信息'
+  },
+  onShow() {
+    document.title = '房屋信息' 
  },

  methods: {
--- a/src/apps/AppBuilding/components/searchMap.vue
+++ b/src/apps/AppBuilding/components/searchMap.vue
@@ -139,7 +139,9 @@ export default {
    this.getCenterLatLng().then(points => {
      this.getMarkerCluster(points)
    })
-    document.title = '以房找人'
+  },
+  onShow() {
+    document.title = "以房找人"
  },
  created() {
    this.$dict.load("communityBuildingType")
--- a/src/apps/AppBuilding/detail.vue
+++ b/src/apps/AppBuilding/detail.vue
@@ -168,7 +168,9 @@ export default {
        'isFilingCertificateStatus', 'communityBuildingType', 'yesOrNo', 'BulidResidentType').then(() => {
      this.getBuilding()
    })
-    document.title =  '以房找人'
+  },
+  onShow() {
+    document.title = "以房找人"
  },
  methods: {
    getSelectList(communityId) {
--- a/src/apps/AppBuilding/list.vue
+++ b/src/apps/AppBuilding/list.vue
@@ -37,12 +37,14 @@ export default {
    this.$dict.load('BuildLocationStatus').then(() => {
      this.getList()
    })
-     document.title = '楼栋列表'
    uni.$on('updateList', () => {
      this.current = 1
      this.getList()
    })
  },
+  onShow() {
+    document.title = "楼栋列表"
+  },

  methods: {
    getList() {
--- a/src/apps/AppBuilding/map.vue
+++ b/src/apps/AppBuilding/map.vue
@@ -65,7 +65,9 @@ export default {
  computed: {...mapState(['user'])},
  mounted() {
    this.initMap()
-     document.title =  '以房找人'
+  },
+  onShow() {
+    document.title = "以房找人"
  },
  methods: {
    initMap() {  //初始化地图
--- a/src/apps/AppCountryAlbum/detail.vue
+++ b/src/apps/AppCountryAlbum/detail.vue
@@ -60,7 +60,9 @@ export default {
    console.log(this.params)
    this.getList()
    this.getStatistic()
-     document.title =  '乡村相册'
+  },
+  onShow() {
+    document.title = "乡村相册"
  },

  methods: {
--- a/src/apps/AppCountryAlbum/list.vue
+++ b/src/apps/AppCountryAlbum/list.vue
@@ -38,11 +38,13 @@ export default {
    this.areaId = this.user.areaId
    this.areaName = this.user.areaName
    this.getList()
-    document.title = '乡村相册'
    uni.$on('updateList', () => {
      this.getList()
    })
  },
+  onShow() {
+    document.title = "乡村相册"
+  },

  methods: {
    areaSelect(e) {
--- a/src/apps/AppGridManagement/components/detail.vue
+++ b/src/apps/AppGridManagement/components/detail.vue
@@ -67,7 +67,9 @@ export default {
    this.$dict.load('girdType', 'girdLevel')
    this.areaId = this.user.areaId
    this.getLeafNodes()
-    document.title =  '网格管理'
+  },
+  onShow() {
+    document.title = "网格管理"
  },
  methods: {
    getLeafNodes() {
--- a/src/apps/AppMailList/AppMailList.vue
+++ b/src/apps/AppMailList/AppMailList.vue
@@ -47,7 +47,9 @@ export default {
  computed: { ...mapState(['user']) },
  mounted() {
    this.getList()
-    document.title = '便民通讯录'
+  },
+  onShow() {
+    document.title = "便民通讯录"
  },

  methods: {
--- a/src/apps/AppMailList/add.vue
+++ b/src/apps/AppMailList/add.vue
@@ -78,7 +78,9 @@ export default {
        this.getDetail()
      }
    })
-    document.title =  '新增'
+  },
+  onShow() {
+    document.title = "新增"
  },

  methods: {
--- a/src/apps/AppMailList/list.vue
+++ b/src/apps/AppMailList/list.vue
@@ -43,7 +43,9 @@ export default {
  computed: { ...mapState(['user']) },
  mounted() {
    this.getList()
-    document.title = '便民通讯录'
+  },
+  onShow() {
+    document.title = "便民通讯录"
  },

  methods: {
--- a/src/apps/AppMailList/myAddList.vue
+++ b/src/apps/AppMailList/myAddList.vue
@@ -34,11 +34,13 @@ export default {
  computed: { ...mapState(['user']) },
  mounted() {
    this.getList()
-     document.title = '便民通讯录'
    uni.$on('updateList', () => {
      this.getList()
    })
  },
+  onShow() {
+    document.title = "便民通讯录"
+  },

  methods: {
    getList() {
--- a/src/apps/AppMarryAndDie/Add.vue
+++ b/src/apps/AppMarryAndDie/Add.vue
@@ -80,10 +80,12 @@ export default {
  },
  computed: { ...mapState(['user']) },
  onLoad() {
-    document.title = '婚丧嫁娶'
    this.$dict.load('marriageType', 'modeType')
    this.forms.areaId = this.user.areaId
  },
+  onShow() {
+    document.title = "婚丧嫁娶"
+  },

  mounted() {},
  methods: {
--- a/src/apps/AppMarryAndDie/AllActiveList.vue
+++ b/src/apps/AppMarryAndDie/AllActiveList.vue
@@ -76,14 +76,15 @@ export default {
  },
  computed: {},
  watch: {},
-  onLoad() {
-     document.title = '婚丧嫁娶' 
+  onLoad() { 
    this.$dict.load('marriageType', 'modeType').then(() => {
      this.getCount()
      this.getList()
    })
  },
-  onShow() {},
+  onShow() {
+    document.title = "婚丧嫁娶"
+  },
  methods: {
    getCount() {
      uni.showLoading({
--- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue
+++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
@@ -141,7 +141,6 @@ export default {
  },
  watch: {},
  onLoad(o) {
-    document.title = '婚丧嫁娶'
    if (o.indexTabs) {
      this.currentTabs = o.indexTabs
      this.getList()
@@ -156,6 +155,9 @@ export default {
      this.getEchart()
    })
  },
+  onShow() {
+    document.title = "婚丧嫁娶"
+  },
  mounted() {
    this.Echart = echarts.init(document.getElementById('yearStatistic'))
  },
--- a/src/apps/AppMarryAndDie/CadreList.vue
+++ b/src/apps/AppMarryAndDie/CadreList.vue
@@ -77,13 +77,14 @@ export default {
  computed: {},
  watch: {},
  onLoad() {
-    document.title = '婚丧嫁娶' 
    this.$dict.load('marriageType', 'modeType').then(() => {
      this.getCount()
      this.getList()
    })
  },
-  onShow() {},
+  onShow() {
+    document.title = "婚丧嫁娶"
+  },
  methods: {
    getCount() {
      uni.showLoading({
--- a/src/apps/AppMarryAndDie/FuneralList.vue
+++ b/src/apps/AppMarryAndDie/FuneralList.vue
@@ -77,13 +77,14 @@ export default {
  computed: {},
  watch: {},
  onLoad() {
-    document.title =  '婚丧嫁娶' 
    this.$dict.load('marriageType', 'modeType').then(() => {
      this.getCount()
      this.getList()
    })
  },
-  onShow() {},
+  onShow() {
+    document.title = "婚丧嫁娶"
+  },
  methods: {
    getCount() {
      uni.showLoading({
--- a/src/apps/AppMarryAndDie/MarryList.vue
+++ b/src/apps/AppMarryAndDie/MarryList.vue
@@ -77,13 +77,14 @@ export default {
  computed: {},
  watch: {},
  onLoad() {
-     document.title = '婚丧嫁娶' 
    this.$dict.load('marriageType', 'modeType').then(() => {
      this.getCount()
      this.getList()
    })
  },
-  onShow() {},
+  onShow() {
+    document.title = "婚丧嫁娶"
+  },
  methods: {
    getCount() {
      uni.showLoading({
--- a/src/apps/AppMeetingNotice/AppMeetingNotice.vue
+++ b/src/apps/AppMeetingNotice/AppMeetingNotice.vue
@@ -131,7 +131,7 @@ export default {
  },

  onShow() {
-     document.title =  '会议通知'
+    document.title =  '会议通知'
    this.$dict.load("meetingNoticeBefore", "meetingNoticeAfter");
    this.getData();
  },
--- a/src/apps/AppMeetingNotice/addMeeting.vue
+++ b/src/apps/AppMeetingNotice/addMeeting.vue
@@ -145,7 +145,7 @@ export default {
  },

  onShow() {
-     document.title = '新增会议'
+    document.title = '新增会议'
    this.$dict.load("meetingNoticeBefore", "meetingNoticeAfter");
  },

--- a/src/apps/AppMeetingNotice/belongToMe.vue
+++ b/src/apps/AppMeetingNotice/belongToMe.vue
@@ -67,7 +67,7 @@ export default {
    }
  },
  onShow() {
-     document.title = '我发起的'
+    document.title = '我发起的'
  },
  created() {
    this.injectJWeixin(['sendChatMessage']).then(() => {
--- a/src/apps/AppMeetingNotice/meetingList.vue
+++ b/src/apps/AppMeetingNotice/meetingList.vue
@@ -55,9 +55,12 @@ export default {

  onLoad(opt) {
    this.index = opt.index
-    document.title = opt.index == 0 ? "历史会议" : "草稿箱"
+    
    this.getData();
  },
+  onShow() {
+    document.title = opt.index == 0 ? "历史会议" : "草稿箱"
+  },

  methods: {
    detail({id}) {
--- a/src/apps/AppNotification/read.vue
+++ b/src/apps/AppNotification/read.vue
@@ -30,11 +30,13 @@ export default {
    this.getList();
  },
  created() {
-    document.title = "接收对象";
    this.injectJWeixin().then(() => {
      this.getList();
    })
  },
+  onShow() {
+    document.title = '接收对象'
+  },
  methods: {
    ...mapActions(['previewFile', 'injectJWeixin']),
    getList() {
--- a/src/apps/AppPageBasic/AppPageBasic.vue
+++ b/src/apps/AppPageBasic/AppPageBasic.vue
@@ -26,7 +26,7 @@ export default {
      headerBg: require('./img/header-bg.png'),
    }
  },
-  created() {
+  onShow() {
    document.title = '基层办公'
  },
  methods: {
--- a/src/apps/AppPageCivilization/AppPageCivilization.vue
+++ b/src/apps/AppPageCivilization/AppPageCivilization.vue
@@ -31,7 +31,7 @@ export default {
      headerBg: require('./img/header-bg.png'),
    }
  },
-  created() {
+  onShow() {
    document.title =  '文明乡风'
  },
  methods: {
--- a/src/apps/AppPageParty/AppPageParty.vue
+++ b/src/apps/AppPageParty/AppPageParty.vue
@@ -39,8 +39,8 @@ export default {
      headerBg: require('./img/header-bg.png'),
    }
  },
-  created() {
-   document.title = '基层党建'
+  onShow() {
+    document.title = '基层党建'
  },
  methods: {

--- a/src/apps/AppPageResident/AppPageResident.vue
+++ b/src/apps/AppPageResident/AppPageResident.vue
@@ -31,8 +31,8 @@ export default {
      headerBg: require('./img/header-bg.png'),
    }
  },
-  created() {
-   document.title = '居民管理'
+  onShow() {
+    document.title = '居民管理'
  },
  methods: {

--- a/src/apps/AppPovertyAlleviation/MonitorDetail.vue
+++ b/src/apps/AppPovertyAlleviation/MonitorDetail.vue
@@ -202,7 +202,6 @@ export default {
  onLoad(query) {
    if (query.isFrom) {
      this.isFrom = true
-      document.title = '风险预警详情'
    }
    uni.showLoading()
    this.$dict.load(['fpType', 'riskEliminationMethod', 'fpRiskType', 'fpYesOrNo']).then(() => {
@@ -214,6 +213,9 @@ export default {
      this.getInfo(query.id)
    })
  },
+  onShow() {
+    document.title = '风险预警详情'
+  },

  methods: {
    linkTo(url) {
--- a/src/apps/AppResidentActivitie/Add.vue
+++ b/src/apps/AppResidentActivitie/Add.vue
@@ -97,7 +97,6 @@ export default {
  },
  computed: { ...mapState(['user']) },
  onLoad(o) {
-    document.title = '发布活动'
    this.id = o.id ? o.id : ''
    this.$dict.load('realityStatus').then(() => {
      this.areaId = this.user.areaId
@@ -108,6 +107,9 @@ export default {
      this.getDetail()
    })
  },
+  onShow() {
+    document.title = '发布活动'
+  },

  mounted() {},
  methods: {
--- a/src/apps/AppResidentActivitie/AddPosts.vue
+++ b/src/apps/AppResidentActivitie/AddPosts.vue
@@ -39,9 +39,11 @@ export default {
    }
  },
  onLoad(o) {
-    document.title =  '发布动态' 
    this.id = o.id || ''
  },
+  onShow() {
+    document.title = '发布动态'
+  },
  methods: {
    addPost() {
      if (this.flag) return
--- a/src/apps/AppResidentActivitie/AppResidentActivities.vue
+++ b/src/apps/AppResidentActivitie/AppResidentActivities.vue
@@ -26,7 +26,7 @@
            <div class="times">
              <span class="timesCont">{{ item.beginTime }}</span>

-              <span>| 2天</span>
+              <span>至 {{ item.endTime }}</span>
            </div>

            <div class="areaNmae" v-if="item.areaName || item.address">{{ item.areaName }}{{ item.address }}</div>
@@ -75,7 +75,7 @@ export default {
  },
  watch: {},
  onLoad() {
-    document.title =  '居民活动' 
+    document.title = '居民活动'
    this.$dict.load(['villageActivityStatus']).then(() => {
      this.getList()
    })
@@ -123,7 +123,7 @@ export default {
    },

    toDetail(item) {
-      uni.navigateTo({ url: `./Detail?id=${item.id}` })
+      uni.navigateTo({ url: `./Detail?id=${item.id}&createUserId=${item.createUserId}` })
    },
  },
  onReachBottom() {
--- a/src/apps/AppResidentActivitie/Detail.vue
+++ b/src/apps/AppResidentActivitie/Detail.vue
@@ -13,23 +13,23 @@
            <div class="left-btn" :class="'status' + detail.status">{{ $dict.getLabel('villageActivityStatus', detail.status) }}</div>
          </div>
          <div class="right">
-            <img :src="detail.avatar" alt="" />
-            <span>{{ detail.createUserName }}</span>
+            <img :src="detail.avatar" alt="" v-if="detail.avatar" />
+            <img :src="user.avatar" alt="" v-else />
+            <span>{{ detail.contactPerson }}</span>
          </div>
        </div>

        <div class="cards">
          <div class="cards-left">活动时间</div>
-          <div class="cards-right">{{ detail.beginTime && detail.beginTime.substring(0, detail.beginTime.length - 2) }}</div>
+          <div class="cards-right">{{ detail.beginTime && detail.beginTime.substring(0, detail.beginTime.length - 3) }}</div>
        </div>

        <div class="cards">
          <div class="cards-left">活动人数</div>
          <div class="cards-right" @click="toSignUser()">
-            <span>
-              <span :style="{ color: detail.realNum == detail.total ? '#FF4466 ' : '#1C6BDF' }">{{ detail.realNum || 0 }}</span>
-              <span v-if="detail.total != 0">/{{ detail.total }}</span>
-              <span v-else>/不限</span>
+            <span style="color: #1c6bdf">
+              <span v-if="detail.realNum != 0">{{ detail.realNum }}</span>
+              <span v-else>不限</span>
            </span>
            <u-icon name="arrow-right" color="#DDDDDD" size="28" style="margin-left: 8px"></u-icon>
          </div>
@@ -37,7 +37,7 @@

        <div class="cards">
          <div class="cards-left">活动地点</div>
-          <div class="cards-right" style="width: 75%; text-align: right">{{ detail.address }}</div>
+          <div class="cards-right" style="width: 75%; text-align: right">{{ detail.areaName }}{{ detail.address }}</div>
        </div>
      </div>

@@ -102,10 +102,10 @@
        </div>
      </div>

-      <div class="fixedBtns" v-if="this.current == 0 && detail.status == 0" @click="toAdd">编辑活动</div>
+      <div class="fixedBtns" v-if="this.current == 0 && detail.status == 0 && this.createUserId == this.user.id" @click="toAdd">编辑活动</div>
    </div>

-    <AiFixedBtn>
+    <AiFixedBtn v-if="this.createUserId == this.user.id">
      <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="AddPosts()" />
    </AiFixedBtn>
  </div>
@@ -122,6 +122,7 @@ export default {
  data() {
    return {
      id: '',
+      createUserId: '',
      detail: {},
      activeList: [],
      imgList: [],
@@ -134,11 +135,12 @@ export default {
        },
      ],
      current: 0,
+      timeEndTime: '',
    }
  },
  onLoad(option) {
-    document.title =  '活动报名' 
    this.id = option.id
+    this.createUserId = option.createUserId
    this.$dict.load(['villageActivityStatus']).then(() => {
      this.getDetail()
    })
@@ -147,13 +149,15 @@ export default {
      this.getListInit()
    })
  },
+  onShow() {
+    document.title = '活动报名'
+  },
  methods: {
    getDetail() {
      this.$http.post(`/app/appvillageactivityinfo/queryDetailById?id=${this.id}`).then((res) => {
        if (res?.data) {
-          // res.data.beginTime = res.data.beginTime.substring(0, 16)
-          // res.data.endTime = res.data.endTime.substring(0, 16)
          this.detail = res.data
+
          if (this.detail) {
            if (this.detail.url) {
              this.detail.url = JSON.parse(res.data.url || '[]')
--- a/src/apps/AppResidentDocument/AppResidentDocument.vue
+++ b/src/apps/AppResidentDocument/AppResidentDocument.vue
@@ -66,11 +66,12 @@ export default {
  },
  watch: {},
  onLoad() {
-    document.title =  '居民列表' 
    this.areaId = this.user.areaId
    this.getList()
  },
-  onShow() {},
+  onShow() {
+    document.title =  '居民列表' 
+  },
  methods: {
    getList() {
      this.$http
--- a/src/apps/AppResidentDocument/DetailPeople.vue
+++ b/src/apps/AppResidentDocument/DetailPeople.vue
@@ -121,13 +121,14 @@ export default {
  computed: {},
  watch: {},
  onLoad(o) {
-    document.title =  '家庭成员信息' 
    this.id = o.id
    this.$dict.load('householdRelation', 'nation', 'education', 'maritalStatus', 'politicsStatus', 'militaryStatus', 'faithType', 'job').then(() => {
      this.getDetail()
    })
  },
-  onShow() {},
+  onShow() {
+    document.title =  '家庭成员信息' 
+  },
  methods: {
    getDetail() {
      this.$http.post(`/app/appresident/detail?id=${this.id}`).then((res) => {
--- a/src/apps/AppResidentFile/GroupList.vue
+++ b/src/apps/AppResidentFile/GroupList.vue
@@ -100,7 +100,7 @@ export default {
      showTagManage: false,
    }
  },
-  onLoad() {
+  onShow() {
    document.title =  '添加标签' 
  },
  computed: {
--- a/src/apps/AppResidentFile/components/document.vue
+++ b/src/apps/AppResidentFile/components/document.vue
@@ -82,7 +82,7 @@ export default {
      familyList: [],
    }
  },
-  onLoad() {
+  onShow() {
    document.title =  '居民详情' 
    this.$dict.load('sex', 'nation', 'education', 'job', 'faithType', 'politicsStatus', 'militaryStatus', 'householdRelation', 'householdName')
  },
--- a/src/apps/AppResidentFile/components/info.vue
+++ b/src/apps/AppResidentFile/components/info.vue
@@ -190,12 +190,14 @@ export default {
      ])
    },
  },
-  onLoad() {
-    document.title =  '居民详情' 
+  onLoad() { 
    this.$dict.load('wxCustomerAddWay', 'wxCustomerLogType')
    this.getCustomLog(this.top.custom)
    this.injectJWeixin('openUserProfile')
  },
+  onShow() {
+    document.title =  '居民详情' 
+  }
 }
 </script>

--- a/src/apps/AppResidentFile/resident.vue
+++ b/src/apps/AppResidentFile/resident.vue
@@ -29,7 +29,7 @@ export default {
      id: '',
    }
  },
-  onLoad() {
+  onShow() {
    document.title =  '居民详情' 
  },
  computed: {
--- a/src/apps/AppResourcesManage/recording.vue
+++ b/src/apps/AppResourcesManage/recording.vue
@@ -109,11 +109,11 @@
    </div>
    <div class="footer">
      <span v-if="isRecording || isStop" @click="restart">重新开始</span>
-      <img v-if="isStop" :src="`${!isPlay ? './img/play-icon' : './img/stop-img'}.png`" @click="play">
-      <img v-else :src="isRecording ? stopImg : microphone" @click="record">
+      <img v-if="isStop" :src="`${$cdn}video/${!isPlay ? 'play-icon' : 'stop-img'}.png`" @click="play">
+      <img v-else :src="`${$cdn}video/${isRecording ? 'stop-img' : 'microphone'}.png`"  @click="record">
+      <!-- :src="isRecording ? stopImg : microphone" -->
      <span v-if="isStop" @click="save">保存</span>
    </div>
-
    <audio style="opacity: 0; visibility: hidden;" :src="audioSrc" @ended="onAudioEnd"></audio>
  </div>
 </template>
--- a/src/apps/AppServicePublic/Add.vue
+++ b/src/apps/AppServicePublic/Add.vue
@@ -75,6 +75,8 @@ export default {
    this.forms.areaId = this.user.areaId
    this.listName = o.listName
    this.getType()
+  },
+  onShow() {
    document.title = this.listName
  },

--- a/src/apps/AppServicePublic/AppServicePublic.vue
+++ b/src/apps/AppServicePublic/AppServicePublic.vue
@@ -99,6 +99,9 @@ export default {
    uni.$on('update', () => {
      this.getList()
    })
+    
+  },
+  onShow() {
    document.title = this.listName
  },
  methods: {
--- a/src/apps/AppServicePublic/Detail.vue
+++ b/src/apps/AppServicePublic/Detail.vue
@@ -51,8 +51,11 @@ export default {
    this.id = o.id
    this.listName = o.listName
    this.getType()
+  },
+  onShow() {
    document.title = this.listName
  },
+
  mounted() {},
  methods: {
    previewImage(images, img) {
--- a/src/apps/AppSpecialPeople/add.vue
+++ b/src/apps/AppSpecialPeople/add.vue
@@ -155,8 +155,11 @@ export default {
  computed: { ...mapState(['user']) },
  created() {
    this.getType()
-    document.title =  '新增人员'
  },
+  onShow() {
+    document.title = '新增人员'
+  },
+

  methods: {
    ...mapActions(['selectEnterpriseContact']),
--- a/src/apps/AppSpecialPeople/detail.vue
+++ b/src/apps/AppSpecialPeople/detail.vue
@@ -94,13 +94,15 @@ export default {
    this.getStatistic()
    this.getStatisticMon()
    this.getUserList()
-    document.title = '特殊人群管理'
    uni.$on('specialPeopleList', () => {
      this.getStatistic()
      this.getStatisticMon()
      this.getUserList()
    })
  },
+  onShow() {
+    document.title = '特殊人群管理'
+  },

  methods: {
    areaSelect(e) {
--- a/src/apps/AppUniMsg/Add.vue
+++ b/src/apps/AppUniMsg/Add.vue
@@ -10,7 +10,7 @@
          <u-input v-model="forms.publishUnitName" placeholder="请输入发布单位" maxlength="16" />
        </u-form-item>

-        <u-form-item label="正文" prop="content" required :border-bottom="false" label-position="top" class="contents">
+        <u-form-item label="正文" prop="content" :border-bottom="false" label-position="top" class="contents">
          <u-input v-model="forms.content" placeholder="请输入正文" type="textarea" auto-height height="100" maxlength="500" />
        </u-form-item>

@@ -47,10 +47,12 @@ export default {
  },
  computed: { ...mapState(['user']) },
  onLoad(o) {
-    document.title =  '新增通知公告' 
    this.id = o.id
    this.getDetail()
  },
+  onShow() {
+    document.title = '新增通知公告'
+  },

  mounted() {},
  methods: {
@@ -79,8 +81,13 @@ export default {
            return this.$u.toast('请输入发布组织')
          }

-          if (!this.forms.content) {
-            return this.$u.toast('请输入正文')
+          var isContent = false
+          if (this.forms.content || this.forms.images.length > 0) {
+            isContent = true
+          }
+
+          if (!isContent) {
+            return this.$u.toast('请输入正文或图片')
          }

          const imgs = []
@@ -103,9 +110,9 @@ export default {
              if (res.code == 0) {
                this.flag = false
                this.$u.toast('提交成功')
-                  uni.$emit('updateList')
-                  setTimeout(() => {
-                    uni.navigateBack()
+                uni.$emit('updateList')
+                setTimeout(() => {
+                  uni.navigateBack()
                }, 600)
              }
            })
--- a/src/apps/AppUniMsg/AppUniMsg.vue
+++ b/src/apps/AppUniMsg/AppUniMsg.vue
@@ -78,14 +78,15 @@ export default {
  },
  watch: {},
  onLoad() {
-    document.title = '通知公告' 
    this.getList()
    uni.$on('updateList', () => {
      this.current = 1
      this.getList()
    })
  },
-  onShow() {},
+  onShow() {
+    document.title = '通知公告' 
+  },
  methods: {
    getList() {
      this.$http
--- a/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue
+++ b/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue
@@ -177,9 +177,11 @@ export default {
    this.areaId = this.user.areaId
    this.areaName = this.user.areaName
    this.getList()
-    document.title = '视频监控'
    // this.getMonitors()
  },
+  onShow() {
+    document.title = '视频监控'
+  },
  mounted() {
    this.Echart = echarts.init(document.getElementById('echarts'))     
  }
--- a/src/apps/AppWalkask/AppWalkask.vue
+++ b/src/apps/AppWalkask/AppWalkask.vue
@@ -101,7 +101,6 @@ export default {
    ...mapState(['user']),
  },
  onLoad() {
-    document.title = '走访慰问' 
    this.areaId = this.user.areaId
    this.$dict.load('realityStatus').then(() => {
      this.getList()
@@ -111,6 +110,9 @@ export default {
      this.getList()
    })
  },
+  onShow() {
+    document.title = '走访慰问'
+  },
  mounted() {},
  methods: {
    getList() {
--- a/src/apps/AppWalkask/add.vue
+++ b/src/apps/AppWalkask/add.vue
@@ -86,13 +86,15 @@ export default {
  computed: { ...mapState(['user']) },
  onLoad(o) {
    this.id = o.id
-    document.title =  '新建走访' 
    this.areaIdProps = this.user.areaId
    this.forms.areaId = this.user.areaId
    this.$dict.load('realityStatus').then(() => {
      this.getDetail()
    })
  },
+  onShow() {
+    document.title = '新建走访'
+  },
  mounted() {},
  methods: {
    getDetail() {
--- a/src/apps/AppWalkask/detail.vue
+++ b/src/apps/AppWalkask/detail.vue
@@ -50,11 +50,13 @@ export default {
  computed: {},
  onLoad(o) {
    this.id = o.id
-    document.title = '走访详情' 
    this.$dict.load('realityStatus').then(() => {
      this.getDetail()
    })
  },
+  onShow() {
+    document.title = '走访详情'
+  },
  mounted() {},
  methods: {
    getDetail() {
--- a/src/apps/AppWalkask/walkObject.vue
+++ b/src/apps/AppWalkask/walkObject.vue
@@ -75,9 +75,11 @@ export default {
  computed: {},
  created() {
    console.log(1)
-    document.title = '选择走访慰问对象' 
    this.getDiyList()
  },
+  onShow() {
+    document.title = '选择走访慰问对象'
+  },
  mounted() {},
  methods: {
    getDiyList() {
--- a/src/apps/AppWorkonline/AppWorkonline.vue
+++ b/src/apps/AppWorkonline/AppWorkonline.vue
@@ -89,11 +89,13 @@ export default {
  },
  watch: {},
  onLoad() {
-    document.title =  '网上办事' 
    this.$dict.load('listApprovalStatusHb').then(() => {
      this.getList()
    })
  },
+  onShow() {
+    document.title = '网上办事'
+  },
  mounted() {},
  methods: {
    getList() {
--- a/src/apps/AppWorkonline/Detail.vue
+++ b/src/apps/AppWorkonline/Detail.vue
@@ -237,11 +237,13 @@ export default {
    },
  },
  onLoad(options) {
-   document.title = '审批详情' 
    this.objid = options.id
    this.listType = options.listType
    this.getDetail()
  },
+  onShow() {
+    document.title = '审批详情'
+  },
  data() {
    return {
      objid: '',
--- a/src/apps/AppWorkonline/Msg.vue
+++ b/src/apps/AppWorkonline/Msg.vue
@@ -18,9 +18,11 @@ export default {
    }
  },
  onLoad(val) {
-    document.title = '审批详情' 
    this.flag = val?.flag == 1
  },
+  onShow() {
+    document.title = '审批详情'
+  },
  methods: {
    goBack() {
      uni.navigateTo({
--- a/src/apps/AppWorkonline/Opinion.vue
+++ b/src/apps/AppWorkonline/Opinion.vue
@@ -101,12 +101,14 @@ export default {
    }
  },
  onLoad(options) {
-    document.title = '审批详情'
    this.objid = options.id
    this.type = options.type

    this.getList()
  },
+  onShow() {
+    document.title = '审批详情'
+  },
  computed: {},
  watch: {},
  onShow() {},
--- a/src/apps/AppWorkonline/detail.vue
+++ b/src/apps/AppWorkonline/detail.vue
@@ -237,11 +237,13 @@ export default {
    },
  },
  onLoad(options) {
-   document.title = '审批详情' 
    this.objid = options.id
    this.listType = options.listType
    this.getDetail()
  },
+  onShow() {
+    document.title = '审批详情'
+  },
  data() {
    return {
      objid: '',