diff --git a/src/project/police/AppMessageNotification/AppMessageNotification.vue b/src/project/police/AppMessageNotification/AppMessageNotification.vue
index f0eb8905..59c97981 100644
--- a/src/project/police/AppMessageNotification/AppMessageNotification.vue
+++ b/src/project/police/AppMessageNotification/AppMessageNotification.vue
@@ -6,90 +6,103 @@
       <p>个人群发每天可以给用户发送10条群发消息。</p>
     </div>
     <div class="select-user">
-      <div class="label color-666">用户选择</div>
-      <div class="right">
-        <!-- <span class="color-999">请选择</span> -->
-        <span @click="toSelect">
-          已选择<span class="color-1365DD">10</span>人
+      <div class="label color-666"><span class="tips">*</span>用户选择</div>
+      <div class="right" @click="toSelect">
+        <span>
+          <span v-if="areaIdList && areaIdList.length">已选择<!-- <span class="color-1365DD">10</span>人 --></span>
+          <span class="color-999" v-else>请选择</span>
         </span>
         <img src="./components/img/right-icon.png" alt="">
       </div>
     </div>
     <div class="content">
-      <p class="title fw500">群发消息设置</p>
-      <div class="mini-title color-666">文本内容</div>
+      <p class="title fw500 mar-b32">群发消息设置</p>
+      <div class="select-user pad-lr0">
+        <div class="label color-666"><span class="tips">*</span>群发方式</div>
+        <div class="right">
+          <u-radio-group v-model="form.sendType">
+            <u-radio v-for="(item, index) in sendTypeList" :key="index" :label="item.name" :name="item.type">{{item.name}}</u-radio>
+          </u-radio-group>
+        </div>
+        <u-picker mode="time" v-model="timeShow" :params="timeParams" @confirm="timeSelect"></u-picker>
+      </div>
+      <div class="select-user pad-lr0" v-if="form.sendType == 1">
+        <div class="label color-666"><span class="tips">*</span>群发时间</div>
+        <div class="right"  @click="timeShow=true">
+          <span v-if="form.sendTime">{{form.sendTime}}</span>
+          <span class="color-999" v-else>请选择</span>
+        </div>
+        <u-picker mode="time" v-model="timeShow" :params="timeParams" @confirm="timeSelect"></u-picker>
+      </div>
+      <div class="mini-title color-666"><span class="tips">*</span>文本内容</div>
       <div class="textarea">
-        <u-input v-model="value" type="textarea" :height="400" auto-height maxlength="600" placeholder="请输入文本内容" />
-        <div class="hint">{{ value.length }}/500</div>
+        <u-input v-model="form.content" type="textarea" :height="400" auto-height maxlength="600" placeholder="请输入文本内容" />
+        <div class="hint">{{ form.content.length }}/500</div>
       </div>
       <div class="type">
         <p class="color-666">其它类型</p>
-        <u-radio-group v-model="type">
-          <u-radio  @change="radioChange" v-for="(item, index) in typeList" :key="index" :name="item"> {{item}}</u-radio>
+        <u-radio-group v-model="form.contentType">
+          <u-radio v-for="(item, index) in typeList" :key="index" :name="item.type"> {{item.name}}</u-radio>
         </u-radio-group>
       </div>
       <div class="type-content">
-        <div class="flex" v-if="type == '图片'">
+        <div class="flex" v-if="form.contentType == 'image'">
           <p class="label" style="width:40px;">图片</p>
-          <ai-uploader multiple @data="imgList" :limit="1" action="/admin/file/add2"></ai-uploader>
+          <ai-uploader multiple @data="formData.file" :limit="1" action="/admin/file/add2"></ai-uploader>
         </div>
-        <div v-if="type == '链接'">
+        <div v-if="form.contentType == 'link'">
           <div class="flex border-b">
             <p class="label">链接地址</p>
             <div class="value">
-              <u-input v-model="value" type="text" input-align="right" placeholder="请输入链接地址" height="44" />
+              <u-input v-model="formData.accessUrl" type="text" input-align="right" placeholder="请输入链接地址" height="44" />
             </div>
           </div>
           <div class="flex border-b">
             <p class="label">链接图片</p>
-            <ai-uploader multiple @data="imgList" :limit="1" action="/admin/file/add2"></ai-uploader>
+            <ai-uploader multiple @data="formData.imglList" :limit="1" action="/admin/file/add2"></ai-uploader>
           </div>
           <div class="flex">
             <p class="label">链接标题</p>
             <div class="value">
-              <u-input v-model="value" type="text" input-align="right" placeholder="请输入链接标题" height="44" />
+              <u-input v-model="formData.accessTitle" type="text" input-align="right" placeholder="请输入链接标题" height="44" />
             </div>
           </div>
         </div>
-        <div class="flex" v-if="type == '视频'">
+        <div class="flex" v-if="form.contentType == 'video'">
           <p class="label" style="width:40px;">视频</p>
-          <AiUploader :multiple="true" type="file" :limit="1" placeholder="上传附件" @list="imgList" action="/admin/file/add2"></AiUploader>
+          <AiUploader :multiple="true" type="file" :limit="1" placeholder="上传附件" @list="formData.file" action="/admin/file/add2"></AiUploader>
         </div>
-        <div v-if="type == '小程序'" class="flex-label">
+        <div v-if="form.contentType == 'miniapp'" class="flex-label">
           <div class="flex border-b">
             <p class="label">小程序标题</p>
             <div class="value">
-              <u-input v-model="value" type="text" input-align="right" placeholder="请输入小程序标题" height="44" />
+              <u-input v-model="formData.accessTitle" type="text" input-align="right" placeholder="请输入小程序标题" height="44" />
             </div>
           </div>
           <div class="flex border-b">
             <p class="label">小程序APPID</p>
             <div class="value">
-              <u-input v-model="value" type="text" input-align="right" placeholder="请输入小程序APPID" height="44" />
+              <u-input v-model="formData.accessAppid" type="text" input-align="right" placeholder="请输入小程序APPID" height="44" />
             </div>
           </div>
           <div class="flex border-b">
             <p class="label">小程序跳转页面</p>
             <div class="value">
-              <u-input v-model="value" type="text" input-align="right" placeholder="如pages/home/home" height="44" />
+              <u-input v-model="formData.accessUrl" type="text" input-align="right" placeholder="如pages/home/home" height="44" />
             </div>
           </div>
           <div class="flex">
             <p class="label" style="width:80px;">小程序图片</p>
-            <ai-uploader multiple @data="imgList" :limit="1" action="/admin/file/add2"></ai-uploader>
+            <ai-uploader multiple @data="formData.imglList" :limit="1" action="/admin/file/add2"></ai-uploader>
           </div>
-          
         </div>
-        
-        
       </div>
-      
       <!-- <div class="upload"><u-icon name="plus-circle-fill" color="#1365DD" size="32"></u-icon>添加附件</div> -->
     </div>
     <div class="bg-144"></div>
     <div class="footer">
       <div>取消</div>
-      <div class="confirm">确认发送</div>
+      <div class="confirm" @click="confirm">确认发送</div>
     </div>
     <!-- <u-popup v-model="show" mode="bottom">
       <div class="popup">
@@ -111,25 +124,87 @@ export default {
   appName: "消息通知",
   data() {
     return {
-      value: '',
-      show: true,
-      type: '',
-      typeList: ['图片', '链接', '视频', '小程序'],
-      imgList: []
+      typeList: [
+        {name: '图片', type: 'image'}, 
+        {name: '链接', type: 'link'}, 
+        {name: '视频', type: 'video'}, 
+        {name: '小程序', type: 'miniapp'}
+      ],
+      sendTypeList: [
+        {name: '立即发送', type: '0'}, 
+        {name: '定时发送', type: '1'}
+      ],
+      form: {
+        content: '',
+        contentType: 'text',
+        sendType: '0',
+        sendTime: ''
+      },
+      formData: {
+        file: [],
+        imglList: [],
+        accessImgurl: '',
+        accessTitle: '',
+        accessUrl: '',
+        accessAppid: ''
+      },
+      areaIdList: [],
+      tagIdList: [],
+      timeShow: false,
+      timeParams: {
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true,
+        second: true
+      }
     }
   },
   computed: {...mapState(['user'])},
   methods: {
     radioChange(e) {
-			console.log(e);
+      this.form.contentType = e
 		},
+    typeChange(e) {
+      this.form.sendType = e
+    },
     toSelect() {
-      uni.navigateTo({url: './SelectUser'})
+      uni.navigateTo({url: `./SelectUser?tagIdList=${this.tagIdList}&areaList=${this.areaIdList}`})
+    },
+    timeSelect(e) {
+      this.form.sendTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`
+    },
+    confirm() {
+      if(!this.areaIdList.length) {
+        return this.$u.toast('请选择用户')
+      }
+      if(this.form.sendType == 1 && !this.form.sendTime) {
+        return this.$u.toast('请选择群发时间')
+      }
+      if(!this.form.content) {
+        return this.$u.toast('请输入文本内容')
+      }
+      var params = {
+        ...this.form, 
+        ...this.formData,
+        areaId: this.areaIdList.join(','),
+        tag: this.tagIdList.join(',')
+      }
+      this.$http.post("/app/pushmessage/addOrUpdate", params).then(res => {
+        if (res?.code == 0) {
+          
+        }
+      })
     }
   },
   created() {
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
+    uni.$on('selectTag', res => {
+      this.tagIdList = res.tagIdList
+      this.areaIdList = res.areaIdList
+    })
   },
 }
 </script>
@@ -145,6 +220,14 @@ export default {
     color: #666;
     font-size: 30px;
   }
+  .tips{
+    font-size: 34px;
+    color: #f46!important;
+    vertical-align: middle;
+  }
+  .mar-b32{
+    margin-bottom: 32px;
+  }
   .header{
     background-color: #fff;
     padding: 32px;
@@ -175,7 +258,17 @@ export default {
     .color-1365DD{
       color: #1365DD;
     }
-    
+    .label{
+      width: 160px;
+    }
+    .right{
+      width: calc(100% - 160px);
+      text-align: right;
+    }
+  }
+  .pad-lr0{
+    padding: 0;
+    margin-bottom: 32px;
   }
   .content{
     padding: 32px;
diff --git a/src/project/police/AppMessageNotification/SelectUser.vue b/src/project/police/AppMessageNotification/SelectUser.vue
index 2fc879f4..b5b13c0f 100644
--- a/src/project/police/AppMessageNotification/SelectUser.vue
+++ b/src/project/police/AppMessageNotification/SelectUser.vue
@@ -3,32 +3,28 @@
 
     <div class="select-content">
       <div class="area-flex">
-        <p class="title">地区</p>
-        <AiAreaPicker v-model="areaId" :name.sync="areaName">
-          <div flex>
-            <AiMore v-model="areaName" icon="arrow-down"/>
-          </div>
+        <p class="title"><span class="tips">*</span>地区</p>
+        <AiAreaPicker v-model="areaList" multiple>
+          <span class="label" v-if="areaList.length">已选择</span>
+          <span v-else style="color:#999;">请选择</span>
+          <u-icon name="arrow-down" color="#666" size="24"/>
         </AiAreaPicker>
       </div>
       <div class="type-content">
-        <p class="title">选择标签</p>
+        <p class="title"><span class="tips">*</span>选择标签</p>
         <div class="type-list">
-          <p>重点人群</p>
-          <div class="list">
-            <div class="item active">残疾人</div>
-            <div class="item">务工人员</div>
-          </div>
-          <p>重点人群</p>
-          <div class="list">
-            <div class="item active">残疾人</div>
-            <div class="item">务工人员</div>
+          <div v-for="(item, index) in tagList" :key="index">
+            <p>{{item.name}}</p>
+            <div class="list">
+              <div class="item" :class="items.isCheck ? 'active' : ''" v-for="(items, indexs) in item.tagList" :key="indexs" @click="typeClick(index, indexs)">{{items.name}}</div>
+            </div>
           </div>
         </div>
       </div>
     </div>
     <div class="bg-144"></div>
     <div class="footer">
-      <div class="confirm">确定</div>
+      <div class="confirm" @click="confirm">确定</div>
     </div>
   </section>
 </template>
@@ -41,19 +37,65 @@ export default {
     return {
       value: '',
       areaId: '',
-      areaName: ''
+      areaName: '',
+      areaList: [],
+      tagList: [],
+      tagIdList: []
     }
   },
   computed: {...mapState(['user'])},
   methods: {
-   
+    getTagList() {
+      this.$http.post("/app/wxcp/wxcorptag/listAll?size=100").then(res => {
+        if (res?.code == 0) {
+          res.data.records.map((item) => {
+            item.tagList.map((items) => {
+              items.isCheck = false
+              if(this.tagIdList.includes(items.id)) {
+                items.isCheck = true
+              }
+            })
+          })
+          this.tagList = res.data.records
+        }
+      })
+    },
+    typeClick(index, indexs) {
+      this.tagList[index].tagList[indexs].isCheck = !this.tagList[index].tagList[indexs].isCheck
+    },
+    confirm() {
+      if(!this.areaList.length) {
+        return this.$u.toast('请选择地区')
+      }
+      this.tagIdList = []
+      this.tagList.map((item) => {
+        item.tagList.map((items) => {
+          if(items.isCheck) {
+            this.tagIdList.push(items.id)
+          }
+        })
+      })
+      if(!this.tagIdList.length) {
+        return this.$u.toast('请选择标签')
+      }
+      uni.$emit('selectTag', {
+        areaIdList: this.areaList,
+        tagIdList: this.tagIdList
+      })
+      uni.navigateBack({})
+    }
   },
   onShow() {
     document.title = '人员选择'
   },
-  created() {
+  onLoad(option) {
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
+    if(option.areaList) {
+      this.areaList = option.areaList.split(',')
+      this.tagIdList =  option.tagIdList.split(',')
+    }
+    this.getTagList()
   },
 }
 </script>
@@ -64,15 +106,30 @@ export default {
     .area-flex{
       display: flex;
       justify-content: space-between;
-      padding: 34px 32px;
+      padding: 34px 32px 0;
       line-height: 44px;
+    }
+    .area-content{
+      padding: 16px 32px 32px;
       border-bottom: 1px solid #ddd;
+      .area-item{
+        display: inline-block;
+        margin-right: 16px;
+        .u-icon{
+          margin-left: 4px;
+        }
+      }
     }
     .title{
       line-height: 44px;
       margin-bottom: 16px;
       font-size: 32px;
       color: #666;
+      .tips{
+        font-size: 34px;
+        color: #f46;
+        vertical-align: middle;
+      }
     }
     .local-icon{
       width: 32px;