clay
/
expressweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

11

This commit is contained in:
20932067@zju.edu.cn 2021-03-19 20:31:19 +08:00
parent e4d4954184
commit d007f63e70
16 changed files with 267 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/api.config.js
View File

@ -1,8 +1,8 @@
import axios from 'axios'
// import {getHeaders} from '../utils/token'
// const baseUrl = 'http://localhost:8083/api/'
const baseUrl = 'http://api.tomey.live/api/'
const baseUrl = 'http://localhost:8083/api/'
// const baseUrl = 'http://api.tomey.live/api/'
class HttpRequest {
constructor (baseUrl) {
this.baseUrl = baseUrl

1
src/api/info.js
View File

@ -5,7 +5,6 @@ import qs from 'qs'
export const getDataShowInfo = () => {
return axios.request({
url: 'getdatashowinfo'
// data: qs.stringify(data, { arrayFormat: 'brackets' })
})
}
// 获取列表

10
src/api/user.js Normal file
View File

@ -0,0 +1,10 @@
import axios from './api.config'
import qs from 'qs'
// 获取用户所以信息列表
export const getAllAccount = (data) => {
return axios.request({
url: 'getallaccount',
data: qs.stringify(data, { arrayFormat: 'brackets' })
})
}

2
src/components/admin/AdminLogin.vue
View File

@ -97,7 +97,7 @@
} else {
this.$notify({
title: '登录失败',
message: data.errorMsg,
message: data.msg,
duration: 2000,
type: 'error'
})

223
src/components/admin/allPerson/AllUser.vue
View File

@ -2,22 +2,160 @@
<div class="allUser-page">
<person-title>当前位置 :: 所有用户 >> <em>普通用户</em></person-title>
<div class="allUser-page-cont">
<personList
:titleList='titleList'
:userList='theUserList'
:showBalance='false'
@DeletePerson='handleDeletePerson'></personList>
<div class="findOrder-search">
<el-form :inline="true" :model="findOrderForm" class="user-findOrder">
<el-form-item label="查询条件">
<el-select v-model="selectData.identiyId" clearable placeholder="选择查询条件">
<el-option label="用户名" :value="3"></el-option>
<el-option label="电话" value="phone"></el-option>
<el-option label="快递公司" value="company"></el-option>
</el-select>
</el-form-item>
<el-form-item label="请输入">
<el-input v-model="selectData.username" placeholder="用户名" clearable></el-input>
</el-form-item>
<el-button type="primary" v-on:click="queryData()">查询</el-button>
</el-form>
</div>
<el-table
:data="theUserList"
class="userOrderList"
:default-sort="{prop: 'createTime', order: 'descending'}"
style="width: 100%">
<div class="emptyTip" slot="empty">
暂时没有用户信息 , 赶紧去拉人注册吧!
</div>
<el-table-column type="expand">
<template slot-scope="props">
<el-form label-position="left"
inline class="userTable demo-table-expand">
<el-form-item label="订单号 :">
<span>{{ props.row.id }}</span>
</el-form-item>
<el-form-item label="收货人姓名 :">
<span>{{ props.row.name }}</span>
</el-form-item>
<el-form-item label="电话 :">
<span>{{ props.row.phone }}</span>
</el-form-item>
<el-form-item label="快递大小 :">
<span>{{ props.row.typeDesc }}</span>
</el-form-item>
<el-form-item label="快递公司 :">
<span>{{ props.row.company }}</span>
</el-form-item>
<el-form-item label="取货码 :">
<span>{{ props.row.number }}</span>
</el-form-item>
<el-form-item label="公寓 :">
<span>{{ props.row.flats }}</span>
</el-form-item>
<el-form-item label="寝室号 :">
<span>{{ props.row.hostel }}</span>
</el-form-item>
<el-form-item label="备注 :">
<span>{{ props.row.decs }}</span>
</el-form-item>
<el-form-item>
</el-form-item>
<template v-if="props.row.status!=2">
<el-form-item label="接单人员 :">
<span>{{ props.row.courier.username }}</span>
</el-form-item>
<el-form-item label="接单人电话 :">
<span>{{ props.row.courier.phone }}</span>
</el-form-item>
<el-form-item v-if="props.row.status==2" label="接单时间 :">
<span>{{ props.row.lastTime }}</span>
</el-form-item>
<el-form-item v-if="props.row.status==3" label="送达时间 :">
<span>{{ props.row.lastTime }}</span>
</el-form-item>
<el-form-item v-if="props.row.status==4" label="收取时间 :">
<span>{{ props.row.lastTime }}</span>
</el-form-item>
</template>
<!-- <el-form-item label="发布时间 :">-->
<!-- <span>{{ props.row.createTime }}</span>-->
<!-- </el-form-item>-->
</el-form>
</template>
</el-table-column>
<el-table-column
v-for="item in titleList"
:key='item.id'
:sortable='item.sortable'
:label="item.columnTitle"
:prop="item.prop">
</el-table-column>
<el-table-column
prop="status"
label="快递状态"
filter-placement="bottom-end">
<template slot-scope="scope">
<el-tag
v-if="scope.row.status==1">待取件
</el-tag>
<el-tag
type="warning" v-if="scope.row.status==2"
>运输中
</el-tag>
<el-tag
type="danger" v-if="scope.row.status==3"
disable-transitions>待收取
</el-tag>
<el-tag
type="success" v-if="scope.row.status==4"
disable-transitions>完成
</el-tag>
</template>
</el-table-column>
<el-table-column>
<template slot="header" slot-scope="scope">操作
</template>
<template slot-scope="scope">
<template v-if="scope.row.status==1">
<el-button
size="mini"
class="btn-cancel"
type='danger'
key='Cancel'
v-on:click="cancel(scope.row.id)"
>取消订单
</el-button>
<!-- handleSuccess(scope.$index, scope.row) -->
</template>
<template v-if="scope.row.status==3">
<el-button
size="mini"
key='Delete'
v-on:click="chargeOrder(scope.row.id)"
>确认收货
</el-button>
</template>
</template>
</el-table-column>
</el-table>
</div>
<div class="pageination-oder">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="4"
:page-sizes="[10, 50, 80, 100]"
:page-size="10"
layout="total, sizes, prev, pager, next, jumper"
:total="totalOrder">
</el-pagination>
</div>
</div>
</template>
<script>
import personList from './personList'
import axios from 'axios'
import {getAllAccount} from '../../../api/user'
export default {
components:{
personList
},
data () {
return {
theUserList: [],
@ -25,18 +163,32 @@ export default {
{id: 1, columnTitle: '注册时间', prop: 'regDate', sortable: true},
{id: 2, columnTitle: '名字', prop: 'userName', sortable: false},
{id: 3, columnTitle: '账号', prop: 'userId', sortable: false}
]
],
selectData:{
page: 1,
size: 10,
identiyId:3,
username:'',
email:'',
phone:'',
},
totalOrder:0,
}
},
created () {
this.getAllUser();
this.getAllUser()
},
methods: {
queryData(){
this.getAllUser();
},
getAllUser () {
let loading = this.$loading({lock:true,text:'玩命加载中...'});
// axios.get(`/admin/allUser`).then(response=>{
// let res = response.data;
loading.close();
let loading = this.$loading({lock: true, text: '玩命加载中...'})
getAllAccount(this.selectData).then(res => {
let data = res.data
console.log(data)
})
loading.close()
// if(res.status=='0'){
// this.theUserList = res.result;
// }else{
@ -47,37 +199,13 @@ export default {
//
// })
},
handleDeletePerson(data){
// 删除订单
this.$confirm('此操作将永久删除该用户, 是否继续?',
'提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'error'
}).then(() => {
// axios.get(``).then(response=>{
// let res = response.data;
// if(res.status=='0'){
this.$message({
type: 'success',
message: '删除成功!'
});
// this.getHistoryOrder();
// }else{
// this.$message({
// type: 'error',
// message:res.msg
// });
// }
// }).catch(err=>{
// console.log(err);
// });
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
handleSizeChange (val) {
this.selectData.size = val
this.getUserOrder()
},
handleCurrentChange (val) {
this.selectData.page = val
this.getUserOrder()
}
}
}
@ -88,6 +216,7 @@ export default {
position: relative;
width: 100%;
}
.allUser-page-cont {
position: relative;
width: 100%;

2
src/components/personPage/ChangePassword.vue
View File

@ -83,7 +83,7 @@
}else {
this.$notify({
title: '密码修改失败',
message:data.errorMsg,
message:data.msg,
duration: 2000,
type: 'error'
})

2
src/components/personPage/user/AddOrder.vue
View File

@ -181,7 +181,7 @@
this.$refs.addorder.resetFields()
}else {
this.$message({
message: data.errorMsg,
message: data.msg,
type: 'error'
})
}

16
src/components/personPage/user/CurrentOrder.vue
View File

@ -217,7 +217,7 @@
} else {
this.$message({
type: 'error',
message: resData.errorMsg
message: resData.msg
})
}
})
@ -251,27 +251,27 @@
orderid: id
}
cancelO(data).then((res) => {
console.log(res)
let data = res.data
console.log(data)
if (data.success) {
this.$message({
type: 'success',
message: data.data
message: data.msg
})
setTimeout(this.getUserOrder, 500)
} else {
this.$message({
type: 'error',
message: data.data
message: data.msg
})
}
})
},
getUserOrder () {
// let loading = this.$loading({lock: true, text: '玩命加载中...'})
let loading = this.$loading({lock: true, text: '玩命加载中...'})
getSelfOrderLst(this.selectData).then((res) => {
var data = res.data
// loading.close()
loading.close()
if (data.success) {
this.OrderData = []
var list = data.data.list
@ -285,9 +285,11 @@
}else {
this.$message({
type: 'info',
message: data.errorMsg
message: data.msg
})
}
}).catch(function (){
loading.close()
})
},
updateHandler () {

3
src/components/personPage/user/HOrder.vue
View File

@ -178,7 +178,6 @@
this.getUserOrder()
},
getUserOrder () {
console.log(new Date('2020-12-08T11:52:30.000+00:00').getFullYear())
// let loading = this.$loading({lock: true, text: '玩命加载中...'})
getSelfOrderLst(this.selectData).then((res) => {
var data = res.data
@ -196,7 +195,7 @@
}else {
this.$message({
type: 'info',
message: data.errorMsg
message: data.msg
})
}
})

120
src/components/personPage/user/JoinUs.vue
View File

@ -1,120 +0,0 @@
<template>
<div class="user-joinUs">
<person-title>当前位置 :: 加入我们 >> <em>申请</em></person-title>
<div class="user-joinUs-cont">
<div class="joinUs-title">
<p class="title">你是否想在校园生活中添加一份乐趣,
并且同时获得一份收益? 那就加入我们成为工作人员吧!
</p>
</div>
<div class="info-cont">
<el-form :model="joinUsForm"
label-position='left'
@submit.native.prevent
:status-icon='true'
label-width="5rem" class="joinUs-Form">
<el-form-item label="姓名 : " prop="userName">
<el-input disabled
placeholder="为了安全,不可二次修改!"
v-model.trim="joinUsForm.userName"></el-input>
</el-form-item>
<el-form-item label="性别 : " prop="gender">
<el-radio-group disabled
v-model.number="joinUsForm.gender">
<el-radio :label="1">男</el-radio>
<el-radio :label="0">女</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="联系电话 : " prop="phoneNum">
<el-input disabled
v-model="joinUsForm.phoneNum"></el-input>
</el-form-item>
<el-form-item label="联系地址 : " prop="address">
<el-input disabled
placeholder="输入您的联系地址便于配送"
v-model="joinUsForm.address"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary"
round
@click="handleJoinUs">申请加入</el-button>
</el-form-item>
</el-form>
</div>
</div>
</div>
</template>
<script>
import axios from 'axios'
export default {
data(){
return{
joinUsForm:{}
}
},
created() {
this.getUserInfo();
},
methods:{
getUserInfo(){
let loading = this.$loading({lock:true,text:'玩命加载中...'});
axios.get(`/users/userInformation`).then(response=>{
let res = response.data;
loading.close();
if(res.status=='0'){
this.joinUsForm = res.result;
}else{
console.log(res.msg);
}
}).catch(err=>{
console.log(err);
})
},
handleJoinUs(){
let loading = this.$loading({lock:true,text:'玩命加载中...'});
axios.post(`/admin/joinUsApply`,{userId:this.joinUsForm.userId}).then(response=>{
let res = response.data;
loading.close();
if(res.status=='0'){
this.$message({
message: '恭喜你，申请成功! 请注意消息提醒',
type: 'success',
duration:4000,
showClose:true
});
}else{
this.$message({
message:res.msg,
type: 'error',
duration:2000,
showClose:true
});
}
}).catch(err=>{
console.log(err);
})
}
}
}
</script>
<style lang='scss'>
.user-joinUs-cont{
padding-top: 2rem;
.info-cont{
padding-top: 2rem;
width: 40%;
min-width: 20rem;
margin: 0 auto;
}
}
.joinUs-title .title{
color: #777;
margin-bottom: 2rem;
}
</style>

8
src/components/personPage/user/User.vue
View File

@ -62,14 +62,6 @@ export default {
menuItem: [
{route: 'mymeg', listTitle: '消息'}
]
},
{
index: '4',
icon: 'el-icon-edit-outline',
title: '加入我们',
menuItem: [
{route: 'ju', listTitle: '申请'}
]
}
],
isCollapse: false

6
src/components/personPage/woker/AllUserOrderList.vue
View File

@ -179,7 +179,7 @@
}else {
this.$message({
type: 'info',
message: data.errorMsg
message: data.msg
})
}
})
@ -192,13 +192,13 @@
if (res.data.success) {
this.$message({
type: 'success',
message: res.data.errorMsg
message: res.data.msg
})
this.getUserOrder()
} else {
this.$message({
type: 'error',
message: res.data.errorMsg
message: res.data.msg
})
}
})

4
src/components/personPage/woker/WokerHistoryOrder.vue
View File

@ -192,7 +192,7 @@
} else {
this.$message({
type: 'error',
message: resData.errorMsg
message: resData.msg
})
}
})
@ -221,7 +221,7 @@
} else {
this.$message({
type: 'info',
message: data.errorMsg
message: data.msg
})
}
})

4
src/components/personPage/woker/WokerReceivedOrder.vue
View File

@ -206,7 +206,7 @@
} else {
this.$message({
type: 'error',
message: resData.errorMsg
message: resData.msg
})
}
})
@ -235,7 +235,7 @@
} else {
this.$message({
type: 'info',
message: data.errorMsg
message: data.msg
})
}
})

4
src/router/index.js
View File

@ -94,10 +94,6 @@ const router = new Router({
path: 'mymeg',
component: () => import('@compage/MyMessage'),
},
{
path: 'ju',
component: () => import('@compage/user/JoinUs'),
}
]
},
{