diff --git a/src/project/police/AppMessageNotification/AppMessageNotification.vue b/src/project/police/AppMessageNotification/AppMessageNotification.vue index 59c97981..cea01a4d 100644 --- a/src/project/police/AppMessageNotification/AppMessageNotification.vue +++ b/src/project/police/AppMessageNotification/AppMessageNotification.vue @@ -6,11 +6,11 @@

个人群发每天可以给用户发送10条群发消息。

-
*用户选择
+
用户选择
- 已选择 - 请选择 + 全部 + 已选择
@@ -48,7 +48,7 @@

图片

- +
@@ -59,7 +59,7 @@

链接图片

- +

链接标题

@@ -70,7 +70,11 @@

视频

- + +
+
+

视频

+
@@ -93,7 +97,7 @@

小程序图片

- +
@@ -126,9 +130,8 @@ export default { return { typeList: [ {name: '图片', type: 'image'}, - {name: '链接', type: 'link'}, {name: '视频', type: 'video'}, - {name: '小程序', type: 'miniapp'} + {name: '文件', type: 'file'} ], sendTypeList: [ {name: '立即发送', type: '0'}, @@ -141,12 +144,13 @@ export default { sendTime: '' }, formData: { - file: [], - imglList: [], + fileList: [], + imgList: [], accessImgurl: '', accessTitle: '', accessUrl: '', - accessAppid: '' + accessAppid: '', + file: {} }, areaIdList: [], tagIdList: [], @@ -173,7 +177,14 @@ export default { 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}` + var nowTime = new Date().getTime() * 1 + var beginTimes = new Date(e.year + '/' + e.month + '/' + e.day + ' ' + e.hour + ':' + e.minute + ':' + e.second).getTime() * 1 + if (nowTime > beginTimes) { + // this.form.sendTime = '' + return this.$u.toast('群发时间应大于当前时间') + } else { + this.form.sendTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}` + } }, confirm() { if(!this.areaIdList.length) { @@ -185,11 +196,17 @@ export default { if(!this.form.content) { return this.$u.toast('请输入文本内容') } + if(this.formData.fileList.length) { + this.formData.file = this.formData.fileList[0] + } + if(this.formData.imgList.length) { + this.formData.accessUrl = this.formData.imgList[0].url + } var params = { ...this.form, ...this.formData, areaId: this.areaIdList.join(','), - tag: this.tagIdList.join(',') + tag: this.tagIdList.join(','), } this.$http.post("/app/pushmessage/addOrUpdate", params).then(res => { if (res?.code == 0) { diff --git a/src/project/police/AppMessageNotification/SelectUser.vue b/src/project/police/AppMessageNotification/SelectUser.vue index b5b13c0f..a86ea783 100644 --- a/src/project/police/AppMessageNotification/SelectUser.vue +++ b/src/project/police/AppMessageNotification/SelectUser.vue @@ -3,7 +3,7 @@
-

*地区

+

地区

已选择 请选择 @@ -11,7 +11,7 @@
-

*选择标签

+

选择标签

{{item.name}}

@@ -64,9 +64,9 @@ export default { this.tagList[index].tagList[indexs].isCheck = !this.tagList[index].tagList[indexs].isCheck }, confirm() { - if(!this.areaList.length) { - return this.$u.toast('请选择地区') - } + // if(!this.areaList.length) { + // return this.$u.toast('请选择地区') + // } this.tagIdList = [] this.tagList.map((item) => { item.tagList.map((items) => { @@ -75,9 +75,9 @@ export default { } }) }) - if(!this.tagIdList.length) { - return this.$u.toast('请选择标签') - } + // if(!this.tagIdList.length) { + // return this.$u.toast('请选择标签') + // } uni.$emit('selectTag', { areaIdList: this.areaList, tagIdList: this.tagIdList diff --git a/src/project/police/AppPeopleList/Add.vue b/src/project/police/AppPeopleList/Add.vue new file mode 100644 index 00000000..f2f12d1e --- /dev/null +++ b/src/project/police/AppPeopleList/Add.vue @@ -0,0 +1,379 @@ + + + + + diff --git a/src/project/police/AppPeopleList/AppPeopleList.vue b/src/project/police/AppPeopleList/AppPeopleList.vue new file mode 100644 index 00000000..1d6b963c --- /dev/null +++ b/src/project/police/AppPeopleList/AppPeopleList.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/src/project/police/AppPeopleList/Content.vue b/src/project/police/AppPeopleList/Content.vue new file mode 100644 index 00000000..c7ab8256 --- /dev/null +++ b/src/project/police/AppPeopleList/Content.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/src/project/police/AppPeopleList/DetailCard.vue b/src/project/police/AppPeopleList/DetailCard.vue new file mode 100644 index 00000000..8ba8735a --- /dev/null +++ b/src/project/police/AppPeopleList/DetailCard.vue @@ -0,0 +1,222 @@ + + + + + diff --git a/src/project/police/AppPeopleList/DetailPeople.vue b/src/project/police/AppPeopleList/DetailPeople.vue new file mode 100644 index 00000000..50cb2582 --- /dev/null +++ b/src/project/police/AppPeopleList/DetailPeople.vue @@ -0,0 +1,404 @@ + + + + + diff --git a/src/project/police/AppPeopleList/ExamineList.vue b/src/project/police/AppPeopleList/ExamineList.vue new file mode 100644 index 00000000..1266b12c --- /dev/null +++ b/src/project/police/AppPeopleList/ExamineList.vue @@ -0,0 +1,276 @@ + + + + + diff --git a/src/project/police/AppPeopleList/PeopleList.vue b/src/project/police/AppPeopleList/PeopleList.vue new file mode 100644 index 00000000..147bcfb8 --- /dev/null +++ b/src/project/police/AppPeopleList/PeopleList.vue @@ -0,0 +1,320 @@ + + + + + diff --git a/src/project/police/AppPeopleList/components/img/4.png b/src/project/police/AppPeopleList/components/img/4.png new file mode 100644 index 00000000..d7cee623 Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/4.png differ diff --git a/src/project/police/AppPeopleList/components/img/44.png b/src/project/police/AppPeopleList/components/img/44.png new file mode 100644 index 00000000..ae49d85f Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/44.png differ diff --git a/src/project/police/AppPeopleList/components/img/blue-bg.png b/src/project/police/AppPeopleList/components/img/blue-bg.png new file mode 100644 index 00000000..ca1d392b Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/blue-bg.png differ diff --git a/src/project/police/AppPeopleList/components/img/del-icon.png b/src/project/police/AppPeopleList/components/img/del-icon.png new file mode 100644 index 00000000..b3424dac Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/del-icon.png differ diff --git a/src/project/police/AppPeopleList/components/img/edit-icon.png b/src/project/police/AppPeopleList/components/img/edit-icon.png new file mode 100644 index 00000000..30a07533 Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/edit-icon.png differ diff --git a/src/project/police/AppPeopleList/components/img/green-bg.png b/src/project/police/AppPeopleList/components/img/green-bg.png new file mode 100644 index 00000000..d8de7d1f Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/green-bg.png differ diff --git a/src/project/police/AppPeopleList/components/img/icon1h@2x.png b/src/project/police/AppPeopleList/components/img/icon1h@2x.png new file mode 100644 index 00000000..c245cabd Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/icon1h@2x.png differ diff --git a/src/project/police/AppPeopleList/components/img/icon1n@2x.png b/src/project/police/AppPeopleList/components/img/icon1n@2x.png new file mode 100644 index 00000000..556b0245 Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/icon1n@2x.png differ diff --git a/src/project/police/AppPeopleList/components/img/right-icon.png b/src/project/police/AppPeopleList/components/img/right-icon.png new file mode 100644 index 00000000..58a59c4d Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/right-icon.png differ diff --git a/src/project/police/AppPeopleList/components/img/tsrq@2x.png b/src/project/police/AppPeopleList/components/img/tsrq@2x.png new file mode 100644 index 00000000..34f11370 Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/tsrq@2x.png differ diff --git a/src/project/police/AppPeopleList/components/img/tsrq备份@2x.png b/src/project/police/AppPeopleList/components/img/tsrq备份@2x.png new file mode 100644 index 00000000..4e215d2a Binary files /dev/null and b/src/project/police/AppPeopleList/components/img/tsrq备份@2x.png differ diff --git a/src/project/police/AppResidentFile/AppResidentFile.vue b/src/project/police/AppResidentFile/AppResidentFile.vue new file mode 100644 index 00000000..64cf56f4 --- /dev/null +++ b/src/project/police/AppResidentFile/AppResidentFile.vue @@ -0,0 +1,825 @@ + + + + + diff --git a/src/project/police/AppResidentFile/GroupList.vue b/src/project/police/AppResidentFile/GroupList.vue new file mode 100644 index 00000000..8103db9c --- /dev/null +++ b/src/project/police/AppResidentFile/GroupList.vue @@ -0,0 +1,325 @@ + + + + + diff --git a/src/project/police/AppResidentFile/components/document.vue b/src/project/police/AppResidentFile/components/document.vue new file mode 100644 index 00000000..77009751 --- /dev/null +++ b/src/project/police/AppResidentFile/components/document.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/project/police/AppResidentFile/components/info.vue b/src/project/police/AppResidentFile/components/info.vue new file mode 100644 index 00000000..0b7fe974 --- /dev/null +++ b/src/project/police/AppResidentFile/components/info.vue @@ -0,0 +1,369 @@ + + + + + diff --git a/src/project/police/AppResidentFile/resident.vue b/src/project/police/AppResidentFile/resident.vue new file mode 100644 index 00000000..bff6801d --- /dev/null +++ b/src/project/police/AppResidentFile/resident.vue @@ -0,0 +1,155 @@ + + + + + diff --git a/src/project/police/AppResidentFile/tagManage.vue b/src/project/police/AppResidentFile/tagManage.vue new file mode 100644 index 00000000..9d94159e --- /dev/null +++ b/src/project/police/AppResidentFile/tagManage.vue @@ -0,0 +1,92 @@ + + + + +