diff --git a/src/assets/layout/logo2x.png b/src/assets/layout/logo2x.png
index e55b930..b7c7c60 100644
Binary files a/src/assets/layout/logo2x.png and b/src/assets/layout/logo2x.png differ
diff --git a/src/views/layout/components/header.vue b/src/views/layout/components/header.vue
index 7081ec2..239f4b5 100644
--- a/src/views/layout/components/header.vue
+++ b/src/views/layout/components/header.vue
@@ -69,7 +69,7 @@ export default {
methods:{
// 前端登出
logout() {
- this.$store.dispatch('LogOut').then(() => {
+ this.$store.dispatch('FedLogOut').then(() => {
// location.reload() // 为了重新实例化vue-router对象 避免bug\
this.$router.push({name:'login'})
})
diff --git a/src/views/send/send.vue b/src/views/send/send.vue
index ace65a1..125747a 100644
--- a/src/views/send/send.vue
+++ b/src/views/send/send.vue
@@ -7,6 +7,7 @@
v-model="formSearch.time"
size="mini"
type="daterange"
+ value-format="yyyy-MM-dd HH:mm:ss"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
@@ -15,8 +16,8 @@
-
-
+
+
@@ -103,7 +104,7 @@ export default {
return {
formSearch: {//模糊搜索
time: '',
- status:''
+ status:null
},
AllData:{
sendTotal:'90000万',
@@ -147,9 +148,9 @@ export default {
const params = {
pageNo: this.currentPage,
pageSize: this.pageSize,
- // fetchStatus :this.formSearch.status || 0,
- // startTime:this.formSearch.time[0] || null,
- // endTime:this.formSearch.time[1] || null
+ fetchStatus :this.formSearch.status || 0,
+ startTime:this.formSearch.time[0] || null,
+ endTime:this.formSearch.time[1] || null
}
getSendList(params).then(res => {
this.tableData = res.data.list
@@ -177,7 +178,7 @@ export default {
},
//获取用户详细信息
showDetail(id) {
- this.dialogSendVisible = true
+ this.dialogDetailVisible = true
},
//查看取码详情
showGetDetail(){
diff --git a/src/views/systemManage/whiteList.vue b/src/views/systemManage/whiteList.vue
index 750c1d7..46b2f9a 100644
--- a/src/views/systemManage/whiteList.vue
+++ b/src/views/systemManage/whiteList.vue
@@ -47,7 +47,7 @@
-
@@ -140,7 +140,6 @@ export default {
},
//添加用户信息
addWhiteListInfo() {
- this.form.insert_time = new Date().toLocaleString()
addWhiteList(this.form).then(res => {
this.$message({
message: res.message,