From 7df5dc2411b541492e0263ad24b4f5ef9ca092dd Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 03 Aug 2021 14:29:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_app
---
pages/report/initiate.vue | 4
pages/dispatch/look.vue | 220 +++++++++++++++---
pages/report/receive.vue | 2
pages/securityStaff/exhibition.vue | 2
pages/message/message.vue | 225 +++++++++++++++++-
pages/report/send.vue | 1
pages/company/company.vue | 2
pages/dispatch/imgissue.vue | 88 +++++-
pages/dispatch/issue.vue | 123 +++++++++
9 files changed, 579 insertions(+), 88 deletions(-)
diff --git a/pages/company/company.vue b/pages/company/company.vue
index 58a6a3d..fd36713 100644
--- a/pages/company/company.vue
+++ b/pages/company/company.vue
@@ -112,7 +112,7 @@
that.newsList.push(that.dataList[that.pagelist]);
flag = false;
that.flag = false;
-
+ this.status = 'nomore';
}
}
diff --git a/pages/dispatch/imgissue.vue b/pages/dispatch/imgissue.vue
index c6ae0a8..ddd8e04 100644
--- a/pages/dispatch/imgissue.vue
+++ b/pages/dispatch/imgissue.vue
@@ -8,11 +8,20 @@
</u-form-item>
<u-form-item label-position='top' label="指令相关图片" class='imgissue-upload'>
- <!-- <u-upload :action="action" :file-list="fileList" max-count='1'></u-upload> -->
<seeImgs :imgs="imgs" :videos="[]" @del="delImg" :type="'imgs'"></seeImgs>
- <image style="width: 4rem; height: 4rem; display: block;" @tap="takePhoto" src="../../static/images/upload.png" mode=""></image>
+ <image style="width: 4rem; height: 4rem; display: block;" @tap="takePhoto"
+ src="../../static/images/upload.png" mode=""></image>
</u-form-item>
+ <u-form-item label-position='top' prop="recipientText" label="指令接收人" :required="true">
+
+ <u-input v-model="form.recipientText" type="select" placeholder="请选择接收人" :border="false"
+ @click="recipientClick" />
+ <u-select v-model="recipientShow" mode="mutil-column-auto" :list="recipientList"
+ @confirm="recipientConfirm">
+ </u-select>
+
+ </u-form-item>
</u-form>
<view>
@@ -33,14 +42,13 @@
},
data() {
return {
- action: 'http://192.168.0.108:81/blade-resource/oss/endpoint/put-file',
- fileList: [{
- url: 'http://pics.sc.chinaz.com/files/pic/pic9/201912/hpic1886.jpg',
- }],
+ recipientShow: false,
+ recipientList: [],
form: {
content: '',
-
+ recipient: '',
+ recipientText: ''
},
rules: {
@@ -49,13 +57,17 @@
required: true,
message: '指令内容不能少于5个字',
trigger: ['change', 'blur'],
- }]
+ }],
+ recipientText: [{
+ required: true,
+ message: '请选择接收人',
+ trigger: ['change', 'blur'],
+ }],
},
imgs: [],
};
},
onLoad() {
- console.log(this.$store.state)
},
onReachBottom() {
@@ -65,8 +77,46 @@
this.$refs.uForm.setRules(this.rules);
},
methods: {
+ recipientClick() {
+ uni.request({
+ url: this.$store.state.piAPI + "/blade-system/dept/lazy-tree-user-app?userId=" + this.$store
+ .state
+ .UserData.user_id,
+ method: "get",
+ data: {
+ },
+ success: (res) => {
+ this.recipientList = []
+ res.data.forEach(item => {
+ if (item.hasChildren) {
+ this.recipientList.push(item)
+ }
+ })
+ this.recipientShow = true;
+ }
+ });
+
+ },
+ recipientConfirm(e) {
+ if (e.length > 1) {
+ this.form.recipient = e[1].value
+ this.form.recipientText = e[1].label
+ } else {
+ this.form.recipient = e[0].value
+ this.form.recipientText = e[0].label
+ }
+
+ },
initiateClick() {
+ var imgurl = '';
+ this.imgs.forEach((item, index) => {
+ if (index == this.imgs.length - 1) {
+ imgurl += item.src
+ } else {
+ imgurl += item.src + ','
+ }
+ })
this.$refs.uForm.validate(valid => {
if (valid) {
uni.request({
@@ -74,22 +124,21 @@
method: "post",
data: {
// 接收
- receiveDirectiveIds: this.$store.state
- .UserData.user_id,
+ receiveDirectiveIds: this.form.recipient,
// 发送
sendDirectiveId: this.$store.state
.UserData.user_id,
content: this.form.content,
- sendTime: "2021-07-22 12:00:00",
+ url: imgurl
},
success: (res) => {
if (res.data.msg == "操作成功") {
- // this.$refs.uToast.show({
- // title: '发送成功',
- // type: 'success',
- // url: '/pages/report/report'
- // })
+ this.$refs.uToast.show({
+ title: '指令下发成功',
+ type: 'success',
+ url: '/pages/dispatch/dispatch'
+ })
}
}
});
@@ -130,13 +179,14 @@
for (var i = 0; i < tempFilePath.length; i++) {
uni.uploadFile({
// url: 'https://web.byisf.com/api/blade-jfpts/depl/put-depl', //仅为示例，非真实的接口地址
- url: 'http://192.168.0.108:81/blade-resource/oss/endpoint/put-file',
+ url: 'http://192.168.0.108:81/blade-resource/oss/endpoint/put-file-app',
filePath: tempFilePath[i],
name: 'file',
formData: {
'user': 'test' // 上传附带参数
},
success: (data) => {
+ console.log(data, JSON.parse(data.data).data)
uni.showToast({
title: '上传图片成功！',
duration: 1000
@@ -152,8 +202,6 @@
}
});
},
-
-
}
};
</script>
diff --git a/pages/dispatch/issue.vue b/pages/dispatch/issue.vue
index e72ff1a..932de42 100644
--- a/pages/dispatch/issue.vue
+++ b/pages/dispatch/issue.vue
@@ -1,6 +1,30 @@
<template>
<view class="container">
- 开发中
+ <view class='initiae-box'>
+ <u-form :model="form" ref="uForm">
+
+ <u-form-item label-position='top' prop="content" label="指令内容" :required="true">
+ <u-input type='textarea' v-model="form.content" placeholder="请输入指令内容" />
+ </u-form-item>
+
+ <u-form-item label-position='top' prop="recipientText" label="指令接收人" :required="true">
+
+ <u-input v-model="form.recipientText" type="select" placeholder="请选择接收人" :border="false"
+ @click="recipientClick" />
+ <u-select v-model="recipientShow" mode="mutil-column-auto" :list="recipientList"
+ @confirm="recipientConfirm">
+ </u-select>
+
+ </u-form-item>
+
+ </u-form>
+ <view>
+ <u-button type="primary" @click="initiateClick">发送</u-button>
+ </view>
+ <view>
+ <u-toast ref="uToast" />
+ </view>
+ </view>
</view>
</template>
@@ -8,20 +32,109 @@
export default {
data() {
return {
-
+ recipientShow: false,
+ recipientList: [],
+
+ form: {
+ content: '',
+ recipient: '',
+ recipientText: ''
+ },
+
+ rules: {
+ content: [{
+ min: 5,
+ required: true,
+ message: '指令内容不能少于5个字',
+ trigger: ['change', 'blur'],
+ }],
+ recipientText: [{
+ required: true,
+ message: '请选择接收人',
+ trigger: ['change', 'blur'],
+ }],
+
+ },
};
},
onLoad() {
+ console.log(this.$store.state)
},
onReachBottom() {
},
- mounted() {
+ mounted() {},
+ onReady() {
+ this.$refs.uForm.setRules(this.rules);
},
- methods: {}
+ methods: {
+ recipientClick() {
+ uni.request({
+ url: this.$store.state.piAPI + "/blade-system/dept/lazy-tree-user-app?userId=" + this.$store
+ .state
+ .UserData.user_id,
+ method: "get",
+ data: {
+
+ },
+ success: (res) => {
+ this.recipientList = []
+ res.data.forEach(item => {
+ if (item.hasChildren) {
+ this.recipientList.push(item)
+ }
+ })
+ this.recipientShow = true;
+ }
+ });
+
+ },
+ recipientConfirm(e) {
+ if (e.length > 1) {
+ this.form.recipient = e[1].value
+ this.form.recipientText = e[1].label
+ } else {
+ this.form.recipient = e[0].value
+ this.form.recipientText = e[0].label
+ }
+
+ },
+ initiateClick() {
+ this.$refs.uForm.validate(valid => {
+ if (valid) {
+ uni.request({
+ url: this.$store.state.piAPI + "/directive/saveDirectiveAndFile",
+ method: "post",
+ data: {
+ // 接收
+ receiveDirectiveIds: this.form.recipient,
+ // 发送
+ sendDirectiveId: this.$store.state
+ .UserData.user_id,
+ content: this.form.content,
+ },
+ success: (res) => {
+ if (res.data.msg == "操作成功") {
+ this.$refs.uToast.show({
+ title: '指令下发成功',
+ type: 'success',
+ url: '/pages/dispatch/dispatch'
+ })
+ }
+ }
+ });
+ } else {
+ console.log('验证失败');
+ }
+ });
+ }
+ }
};
</script>
+
<style lang="scss">
-
+ .initiae-box {
+ padding: 0 30rpx;
+ }
</style>
diff --git a/pages/dispatch/look.vue b/pages/dispatch/look.vue
index b60ea7d..ff3d45d 100644
--- a/pages/dispatch/look.vue
+++ b/pages/dispatch/look.vue
@@ -2,38 +2,50 @@
<view class="container">
<u-tabs :list="list" :is-scroll="false" :current="current" active-color="#14B9C8" inactive-color="#595959"
height="100" @change="change"></u-tabs>
- <u-search v-model="keyword" shape="round" class="u-search" input-align="center" height="70"></u-search>
+ <u-search v-model='keyValue' placeholder='请输入指令内容' shape="round" class="u-search" input-align="center"
+ height="70" @search='searchValue' @custom='searchValue' @clear='clearValue' @change='changeValue'>
+ </u-search>
- <view class="inTmain" v-for="(item,index) in receiveDataList" v-show="current == 0">
- <u-card :title="item.content" @click="goDetail(item)">
- <view class="" slot="body">
- <view>
- <view style="margin-bottom: 10px;" class="u-body-item-title u-line-2">
- 发送指令人：{{item.sendName}}</view>
+ <view v-show="current == 0 && newsList.length > 0">
+ <view class="inTmain" v-for="(item,index) in newsList">
+ <u-card :title="item.content" @click="goDetail(item)">
+ <view class="" slot="body">
+ <view>
+ <view style="margin-bottom: 10px;" class="u-body-item-title u-line-2">
+ 发送指令人：{{item.sendName}}</view>
+ </view>
+ <view>
+ <view class="u-body-item-title u-line-2">接受指令人：{{item.receiveName}}</view>
+ </view>
</view>
- <view>
- <view class="u-body-item-title u-line-2">接受指令人：{{item.receiveName}}</view>
- </view>
- </view>
- <view class="" slot="foot">
- </u-icon>发送指令时间：{{item.sendTime}}</view>
- </u-card>
+ <view class="" slot="foot">
+ </u-icon>发送指令时间：{{item.sendTime}}</view>
+ </u-card>
+ </view>
+ <u-loadmore class='msg' :status="status" />
</view>
- <view class="inTmain" v-for="(item,index) in issueDataList" v-show="current == 1">
- <u-card :title="item.content" @click="goDetail(item)">
- <view class="" slot="body">
- <view>
- <view style="margin-bottom: 10px;" class="u-body-item-title u-line-1">
- 发送指令人：{{item.sendName}}</view>
+ <view v-show="current == 1 && newsList.length > 0">
+ <view class="inTmain" v-for="(item,index) in newsList">
+ <u-card :title="item.content" @click="goDetail(item)">
+ <view class="" slot="body">
+ <view>
+ <view style="margin-bottom: 10px;" class="u-body-item-title u-line-2">
+ 发送指令人：{{item.sendName}}</view>
+ </view>
+ <view>
+ <view class="u-body-item-title u-line-2">接受指令人：{{item.receiveName}}</view>
+ </view>
</view>
- <view>
- <view class="u-body-item-title u-line-1">接受指令人：{{item.receiveName}}</view>
- </view>
- </view>
- <view class="" slot="foot">
- </u-icon>发送指令时间：{{item.sendTime}}</view>
- </u-card>
+ <view class="" slot="foot">
+ </u-icon>发送指令时间：{{item.sendTime}}</view>
+ </u-card>
+ </view>
+ <u-loadmore class='msg' :status="status" />
+ </view>
+
+ <view class="msg" v-show='newsList.length == 0'>
+ 暂无数据
</view>
</view>
@@ -43,8 +55,6 @@
export default {
data() {
return {
- receiveDataList: [],
- issueDataList: [],
list: [{
name: '发送指令'
},
@@ -53,18 +63,56 @@
}
],
current: 0,
- keyword: ''
+ dataList: [],
+ newsList: [],
+ status: 'loadmore',
+ keyValue: '',
+ pagelist: 0,
+ flag: true
};
},
- onLoad() {},
+ onLoad() {
+
+ },
onReachBottom() {
+ var that = this;
+
+ if (that.dataList.length - 1 == that.pagelist && this.status != 'nomore' && that.flag == true) {
+ that.newsList.push(that.dataList[that.pagelist]);
+ this.status = 'nomore';
+ that.flag = false;
+ return;
+ } else {
+ if (that.flag == false) {
+ this.status = 'nomore';
+ return
+ }
+ // 后续将改为与后端联动
+ this.status = 'loading';
+
+ setTimeout(() => {
+ var flag = true;
+
+ for (var i = 0; i < 5; i++) {
+
+ if (that.pagelist <= that.dataList.length - 2 && flag == true) {
+
+ that.newsList.push(that.dataList[that.pagelist++])
+
+ if (that.dataList.length - 1 == that.pagelist) flag == false
+
+ }
+
+ }
+ }, 2000);
+
+ }
},
mounted() {
this.getReceive();
},
methods: {
- // 接收
getReceive() {
var that = this;
uni.request({
@@ -76,11 +124,35 @@
},
success: (res) => {
var resdata = res.data.data.records;
- that.receiveDataList = resdata;
+ that.pagelist = 0;
+ that.newsList = [];
+ that.flag = true;
+ that.dataList = resdata;
+
+ var flag = true;
+
+ for (var i = 0; i < 5; i++) {
+
+ if (that.pagelist <= that.dataList.length - 2) {
+
+ that.newsList.push(that.dataList[that.pagelist++]);
+
+ } else {
+
+ if (that.dataList.length - 1 == that.pagelist && flag == true) {
+
+ that.newsList.push(that.dataList[that.pagelist]);
+ flag = false;
+ that.flag = false;
+ this.status = 'nomore';
+ }
+
+ }
+ }
+
}
});
},
- // 发送
getIssue() {
var that = this;
uni.request({
@@ -91,8 +163,38 @@
},
success: (res) => {
var resdata = res.data.data.records;
- that.issueDataList = resdata;
+ that.pagelist = 0;
+ that.newsList = [];
+ that.flag = true;
+ that.dataList = resdata;
+
+ var flag = true;
+
+ for (var i = 0; i < 5; i++) {
+
+ if (that.pagelist <= that.dataList.length - 2) {
+
+ that.newsList.push(that.dataList[that.pagelist++]);
+
+ } else {
+
+ if (that.dataList.length - 1 == that.pagelist && flag == true) {
+
+ that.newsList.push(that.dataList[that.pagelist]);
+ flag = false;
+ that.flag = false;
+ this.status = 'nomore';
+ }
+
+ }
+ }
+
}
+ });
+ },
+ goDetail(item) {
+ uni.navigateTo({
+ url: './lookDetail?detailData=' + JSON.stringify(item)
});
},
change(index) {
@@ -104,10 +206,43 @@
}
this.current = index;
},
- goDetail(item) {
- uni.navigateTo({
- url: './lookDetail?detailData=' + JSON.stringify(item)
- });
+ searchValue(value) {
+ var that = this;
+ var str = value.replace(/\s*/g, "");
+ if (str == '') {
+ return
+ } else {
+ that.newsList = [];
+ that.dataList.forEach(item => {
+ if (item.content.indexOf(str) != -1) {
+ that.newsList.push(item)
+ }
+ })
+ that.status = 'nomore';
+ }
+ },
+ clearValue() {
+ this.keyValue = ''
+ this.newsList = [];
+ for (var i = 0; i < this.pagelist; i++) {
+ this.newsList.push(this.dataList[i])
+ }
+
+ if (this.flag == false) {
+ this.newsList.push(this.dataList[this.pagelist]);
+ }
+ },
+ changeValue(value) {
+ if (value == '') {
+ this.newsList = [];
+ for (var i = 0; i < this.pagelist; i++) {
+ this.newsList.push(this.dataList[i])
+ }
+
+ if (this.flag == false) {
+ this.newsList.push(this.dataList[this.pagelist]);
+ }
+ }
}
}
};
@@ -138,4 +273,11 @@
}
.inTmain {}
+
+ .msg {
+ height: 72rpx;
+ line-height: 72rpx;
+ text-align: center;
+ color: #999;
+ }
</style>
diff --git a/pages/message/message.vue b/pages/message/message.vue
index 0fc43e5..df0a518 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -2,22 +2,52 @@
<view class="container">
<u-tabs :list="list" :is-scroll="false" :current="current" active-color="#14B9C8" inactive-color="#595959"
height="100" @change="change"></u-tabs>
- <u-search v-model="keyword" shape="round" class="u-search" input-align="center" height="70" :show-action="false"></u-search>
- <view class="inTmain" v-for="(item,index) in dataList">
- <u-card :title="item.title" v-show="item.category == current + 1">
- <view class="" slot="body">
- <view>
- <view style="margin-bottom: 10px;" class="u-body-item-title u-line-1">
- 通知类型：{{item.category == 1 ? '单位公告' : '公安公告'}}</view>
+ <u-search v-model='keyValue' placeholder='请输入公告内容' shape="round" class="u-search" input-align="center"
+ height="70" @search='searchValue' @custom='searchValue' @clear='clearValue' @change='changeValue'>
+ </u-search>
+
+ <view v-show="current == 0 && newsList.length > 0">
+ <view class="inTmain" v-for="(item,index) in newsList">
+ <u-card :title="item.title" @click="goDetail(item)">
+ <view class="" slot="body">
+ <view>
+ <view style="margin-bottom: 10px;" class="u-body-item-title u-line-1">
+ 通知类型：{{item.category == 1 ? '单位公告' : '公安公告'}}</view>
+ </view>
+ <view>
+ <view class="u-body-item-title u-line-1">通知日期：{{item.releaseTime}}</view>
+ </view>
</view>
- <view>
- <view class="u-body-item-title u-line-1">通知日期：{{item.releaseTime}}</view>
- </view>
- </view>
- <view class="" slot="foot">
- </u-icon>发布单位：{{item.depName}}</view>
- </u-card>
+ <view class="" slot="foot">
+ </u-icon>发布单位：{{item.depName}}</view>
+ </u-card>
+ </view>
+ <u-loadmore class='msg' :status="status" />
</view>
+
+ <view v-show="current == 1 && newsList.length > 0">
+ <view class="inTmain" v-for="(item,index) in newsList">
+ <u-card :title="item.title" @click="goDetail(item)">
+ <view class="" slot="body">
+ <view>
+ <view style="margin-bottom: 10px;" class="u-body-item-title u-line-1">
+ 通知类型：{{item.category == 1 ? '单位公告' : '公安公告'}}</view>
+ </view>
+ <view>
+ <view class="u-body-item-title u-line-1">通知日期：{{item.releaseTime}}</view>
+ </view>
+ </view>
+ <view class="" slot="foot">
+ </u-icon>发布单位：{{item.depName}}</view>
+ </u-card>
+ </view>
+ <u-loadmore class='msg' :status="status" />
+ </view>
+
+ <view class="msg" v-show='newsList.length == 0'>
+ 暂无数据
+ </view>
+
</view>
</template>
@@ -25,7 +55,6 @@
export default {
data() {
return {
- dataList: [],
list: [{
name: '单位公告'
},
@@ -34,35 +63,186 @@
}
],
current: 0,
- keyword: ''
+ dataList: [],
+ newsList: [],
+ status: 'loadmore',
+ keyValue: '',
+ pagelist: 0,
+ flag: true
};
},
onLoad() {
},
onReachBottom() {
+ var that = this;
+
+ if (that.dataList.length - 1 == that.pagelist && this.status != 'nomore' && that.flag == true) {
+ that.newsList.push(that.dataList[that.pagelist]);
+ this.status = 'nomore';
+ that.flag = false;
+ return;
+ } else {
+ if (that.flag == false) {
+ this.status = 'nomore';
+ return
+ }
+ // 后续将改为与后端联动
+ this.status = 'loading';
+
+ setTimeout(() => {
+ var flag = true;
+
+ for (var i = 0; i < 5; i++) {
+
+ if (that.pagelist <= that.dataList.length - 2 && flag == true) {
+
+ that.newsList.push(that.dataList[that.pagelist++])
+
+ if (that.dataList.length - 1 == that.pagelist) flag == false
+
+ }
+
+ }
+ }, 2000);
+
+ }
},
mounted() {
- this.getCompany();
+ this.getReceive();
},
methods: {
- getCompany() {
+ getReceive() {
var that = this;
uni.request({
- url: this.$store.state.piAPI + "/blade-desk/notice/page",
+ url: this.$store.state.piAPI + "/blade-desk/notice/page?category=1",
method: "get",
data: {
},
success: (res) => {
var resdata = res.data.data.records;
+ that.pagelist = 0;
+ that.newsList = [];
+ that.flag = true;
that.dataList = resdata;
+
+ var flag = true;
+
+ for (var i = 0; i < 5; i++) {
+
+ if (that.pagelist <= that.dataList.length - 2) {
+
+ that.newsList.push(that.dataList[that.pagelist++]);
+
+ } else {
+
+ if (that.dataList.length - 1 == that.pagelist && flag == true) {
+
+ that.newsList.push(that.dataList[that.pagelist]);
+ flag = false;
+ that.flag = false;
+ this.status = 'nomore';
+ }
+
+ }
+ }
+
}
});
},
+ getIssue() {
+ var that = this;
+ uni.request({
+ url: this.$store.state.piAPI + "/blade-desk/notice/page?category=2",
+ method: "get",
+ data: {
+
+ },
+ success: (res) => {
+ var resdata = res.data.data.records;
+ that.pagelist = 0;
+ that.newsList = [];
+ that.flag = true;
+ that.dataList = resdata;
+
+ var flag = true;
+
+ for (var i = 0; i < 5; i++) {
+
+ if (that.pagelist <= that.dataList.length - 2) {
+
+ that.newsList.push(that.dataList[that.pagelist++]);
+
+ } else {
+
+ if (that.dataList.length - 1 == that.pagelist && flag == true) {
+
+ that.newsList.push(that.dataList[that.pagelist]);
+ flag = false;
+ that.flag = false;
+ this.status = 'nomore';
+ }
+
+ }
+ }
+
+ }
+ });
+ },
+ goDetail(item) {
+ return;
+ uni.navigateTo({
+ url: './lookDetail?detailData=' + JSON.stringify(item)
+ });
+ },
change(index) {
+ if (this.current == index) return;
+ if (index == 0) {
+ this.getReceive();
+ } else {
+ this.getIssue();
+ }
this.current = index;
+ },
+ searchValue(value) {
+ var that = this;
+ var str = value.replace(/\s*/g, "");
+ if (str == '') {
+ return
+ } else {
+ that.newsList = [];
+ that.dataList.forEach(item => {
+ if (item.title.indexOf(str) != -1) {
+ that.newsList.push(item)
+ }
+ })
+ that.status = 'nomore';
+ }
+ },
+ clearValue() {
+ this.keyValue = ''
+ this.newsList = [];
+ for (var i = 0; i < this.pagelist; i++) {
+ this.newsList.push(this.dataList[i])
+ }
+
+ if (this.flag == false) {
+ this.newsList.push(this.dataList[this.pagelist]);
+ }
+ },
+ changeValue(value) {
+ if (value == '') {
+ this.newsList = [];
+ for (var i = 0; i < this.pagelist; i++) {
+ this.newsList.push(this.dataList[i])
+ }
+
+ if (this.flag == false) {
+ this.newsList.push(this.dataList[this.pagelist]);
+ }
+ }
}
}
};
@@ -93,4 +273,11 @@
}
.inTmain {}
+
+ .msg {
+ height: 72rpx;
+ line-height: 72rpx;
+ text-align: center;
+ color: #999;
+ }
</style>
diff --git a/pages/report/initiate.vue b/pages/report/initiate.vue
index a6824a4..12da868 100644
--- a/pages/report/initiate.vue
+++ b/pages/report/initiate.vue
@@ -82,10 +82,10 @@
form: {
content: '',
category: '',
- type: '',
- recipient: '',
categoryText: '',
+ type: '',
typeText: '',
+ recipient: '',
recipientText: ''
},
rules: {
diff --git a/pages/report/receive.vue b/pages/report/receive.vue
index 434db85..be976ce 100644
--- a/pages/report/receive.vue
+++ b/pages/report/receive.vue
@@ -110,7 +110,7 @@
that.newsList.push(that.dataList[that.pagelist]);
flag = false;
that.flag = false;
-
+ this.status = 'nomore';
}
}
diff --git a/pages/report/send.vue b/pages/report/send.vue
index fbdf085..a1fd42d 100644
--- a/pages/report/send.vue
+++ b/pages/report/send.vue
@@ -113,6 +113,7 @@
that.newsList.push(that.dataList[that.pagelist]);
flag = false;
+ this.status = 'nomore';
that.flag = false;
}
diff --git a/pages/securityStaff/exhibition.vue b/pages/securityStaff/exhibition.vue
index 00ae2cd..b7edf33 100644
--- a/pages/securityStaff/exhibition.vue
+++ b/pages/securityStaff/exhibition.vue
@@ -112,7 +112,7 @@
that.newsList.push(that.dataList[that.pagelist]);
flag = false;
that.flag = false;
-
+ this.status = 'nomore';
}
}
--
Gitblit v1.9.3