This commit is contained in:
parent
e20eb2329f
commit
b41fd7c106
|
|
@ -10,17 +10,17 @@ module.exports = {
|
||||||
// Paths
|
// Paths
|
||||||
assetsSubDirectory: 'static',
|
assetsSubDirectory: 'static',
|
||||||
assetsPublicPath: '/',
|
assetsPublicPath: '/',
|
||||||
proxyTable: {
|
// proxyTable: {
|
||||||
'/wokers/*':{
|
// '/wokers/*':{
|
||||||
target:'http://localhost:3000'
|
// target:'http://localhost:3000'
|
||||||
},
|
// },
|
||||||
'/users/*':{
|
// '/users/*':{
|
||||||
target:'http://localhost:3000'
|
// target:'http://localhost:3000'
|
||||||
},
|
// },
|
||||||
'/admin/*':{
|
// '/admin/*':{
|
||||||
target:'http://localhost:3000'
|
// target:'http://localhost:3000'
|
||||||
}
|
// }
|
||||||
},
|
// },
|
||||||
|
|
||||||
// Various Dev Server settings
|
// Various Dev Server settings
|
||||||
host: 'localhost', // can be overwritten by process.env.HOST
|
host: 'localhost', // can be overwritten by process.env.HOST
|
||||||
|
|
@ -60,8 +60,8 @@ module.exports = {
|
||||||
|
|
||||||
// Paths
|
// Paths
|
||||||
assetsRoot: path.resolve(__dirname, '../dist'),
|
assetsRoot: path.resolve(__dirname, '../dist'),
|
||||||
assetsSubDirectory: 'static',
|
assetsSubDirectory: './',
|
||||||
assetsPublicPath: './',
|
assetsPublicPath: '/',
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Source Maps
|
* Source Maps
|
||||||
|
|
|
||||||
|
|
@ -29,76 +29,75 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import leftMenu from './AdminLeftMenu'
|
import leftMenu from './AdminLeftMenu'
|
||||||
import axios from 'axios'
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
leftMenu
|
leftMenu
|
||||||
},
|
},
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
leftMenuData: [
|
leftMenuData: [
|
||||||
{
|
{
|
||||||
index: '1',
|
index: '1',
|
||||||
icon: 'el-icon-location',
|
icon: 'el-icon-location',
|
||||||
title: '所有用户',
|
title: '所有用户',
|
||||||
menuItem: [
|
menuItem: [
|
||||||
{route: 'au', listTitle: '普通用户'},
|
{route: 'au', listTitle: '普通用户'},
|
||||||
{route: 'aw', listTitle: '工作人员'},
|
{route: 'aw', listTitle: '工作人员'},
|
||||||
{route: 'fp', listTitle: '查找用户'}
|
{route: 'fp', listTitle: '查找用户'}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
index: '2',
|
index: '2',
|
||||||
icon: 'el-icon-tickets',
|
icon: 'el-icon-tickets',
|
||||||
title: '所有订单',
|
title: '所有订单',
|
||||||
menuItem: [
|
menuItem: [
|
||||||
{route: 'foo', listTitle: '查找订单'},
|
{route: 'foo', listTitle: '查找订单'},
|
||||||
{route: 'anro', listTitle: '未接订单'},
|
{route: 'anro', listTitle: '未接订单'},
|
||||||
{route: 'aro', listTitle: '已接订单'},
|
{route: 'aro', listTitle: '已接订单'},
|
||||||
{route: 'aho', listTitle: '历史订单'}
|
{route: 'aho', listTitle: '历史订单'}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
index: '3',
|
index: '3',
|
||||||
icon: 'el-icon-message',
|
icon: 'el-icon-message',
|
||||||
title: '消息系统',
|
title: '消息系统',
|
||||||
menuItem: [
|
menuItem: [
|
||||||
{route: 'sm', listTitle: '发送消息'}
|
{route: 'sm', listTitle: '发送消息'}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
index: '4',
|
index: '4',
|
||||||
icon: 'el-icon-edit-outline',
|
icon: 'el-icon-edit-outline',
|
||||||
title: '加入我们',
|
title: '加入我们',
|
||||||
menuItem: [
|
menuItem: [
|
||||||
{route: 'jua', listTitle: '申请列表'},
|
{route: 'jua', listTitle: '申请列表'},
|
||||||
{route: 'jha', listTitle: '历史申请'}
|
{route: 'jha', listTitle: '历史申请'}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
index: '5',
|
index: '5',
|
||||||
icon: 'el-icon-document',
|
icon: 'el-icon-document',
|
||||||
title: '投诉建议',
|
title: '投诉建议',
|
||||||
menuItem: [
|
menuItem: [
|
||||||
{route: 'sl', listTitle: '用户反馈'}
|
{route: 'sl', listTitle: '用户反馈'}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
adminName: ''
|
adminName: ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created () {
|
created () {
|
||||||
this.adminName = sessionStorage.getItem('username')
|
this.adminName = sessionStorage.getItem('username')
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
handleLogout () {
|
handleLogout () {
|
||||||
sessionStorage.clear()
|
sessionStorage.clear()
|
||||||
this.$router.push({path: '/rootlogin'})
|
this.$router.push({path: '/rootlogin'})
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang='scss'>
|
<style scoped lang='scss'>
|
||||||
|
|
|
||||||
|
|
@ -42,58 +42,58 @@
|
||||||
<script>
|
<script>
|
||||||
import {gotoNewOrder} from './../../assets/js/gotoNewOrder'
|
import {gotoNewOrder} from './../../assets/js/gotoNewOrder'
|
||||||
import { mapState } from 'vuex'
|
import { mapState } from 'vuex'
|
||||||
export default {
|
export default {
|
||||||
props:{
|
props: {
|
||||||
leftMenuData:Array
|
leftMenuData: Array
|
||||||
},
|
},
|
||||||
data() {
|
data () {
|
||||||
return {
|
return {
|
||||||
isCollapse: false,//默认展开
|
isCollapse: false, // 默认展开
|
||||||
menuData:this.leftMenuData,
|
menuData: this.leftMenuData,
|
||||||
defaultActive:'userInformation'
|
defaultActive: 'userInformation'
|
||||||
};
|
|
||||||
},
|
|
||||||
watch:{
|
|
||||||
isCollapse(newVal){
|
|
||||||
this.$emit('isCollapse',newVal);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
computed:{
|
|
||||||
...mapState({
|
|
||||||
msgLen:state=>state.user.userInfo.msgLen
|
|
||||||
})
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
handleOpen(key, keyPath) {
|
|
||||||
// console.log(key, keyPath);
|
|
||||||
},
|
|
||||||
handleClose(key, keyPath) {
|
|
||||||
// console.log(key, keyPath);
|
|
||||||
},
|
|
||||||
handleSelect(key, keyPath){
|
|
||||||
// console.log(key,keyPath);
|
|
||||||
// this.isCollapse =true;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
mounted() {
|
|
||||||
//console.log(this.$route.path.split('/')[2]);
|
|
||||||
let RefreshMenu = this.$route.path.split('/')[2];
|
|
||||||
this.$refs.leftMenu.activeIndex = RefreshMenu;
|
|
||||||
this.defaultActive = RefreshMenu;
|
|
||||||
gotoNewOrder.$on('goNewOrder',(index,num)=>{
|
|
||||||
try {
|
|
||||||
this.$refs.leftMenu.activeIndex = index;
|
|
||||||
if(num && !this.isCollapse){
|
|
||||||
this.$refs.leftMenu.open(num);
|
|
||||||
}
|
|
||||||
} catch (error) { }
|
|
||||||
//console.log( this.$refs.leftMenu.activeIndex);
|
|
||||||
});
|
|
||||||
gotoNewOrder.$on('readMessage',()=>{
|
|
||||||
this.$store.commit("saveUserInfo",{msgLen:this.msgLen-1});
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
isCollapse (newVal) {
|
||||||
|
this.$emit('isCollapse', newVal)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
...mapState({
|
||||||
|
msgLen: state => state.user.userInfo.msgLen
|
||||||
|
})
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
handleOpen (key, keyPath) {
|
||||||
|
console.log(key, keyPath)
|
||||||
|
},
|
||||||
|
handleClose (key, keyPath) {
|
||||||
|
console.log(key, keyPath)
|
||||||
|
},
|
||||||
|
handleSelect (key, keyPath) {
|
||||||
|
console.log(key, keyPath)
|
||||||
|
this.isCollapse = true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
mounted () {
|
||||||
|
// console.log(this.$route.path.split('/')[2]);
|
||||||
|
let RefreshMenu = this.$route.path.split('/')[2]
|
||||||
|
this.$refs.leftMenu.activeIndex = RefreshMenu
|
||||||
|
this.defaultActive = RefreshMenu
|
||||||
|
gotoNewOrder.$on('goNewOrder', (index, num) => {
|
||||||
|
try {
|
||||||
|
this.$refs.leftMenu.activeIndex = index
|
||||||
|
if (num && !this.isCollapse) {
|
||||||
|
this.$refs.leftMenu.open(num)
|
||||||
|
}
|
||||||
|
} catch (error) { }
|
||||||
|
// console.log( this.$refs.leftMenu.activeIndex);
|
||||||
|
})
|
||||||
|
gotoNewOrder.$on('readMessage', () => {
|
||||||
|
this.$store.commit('saveUserInfo', {msgLen: this.msgLen - 1})
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang='scss'>
|
<style lang='scss'>
|
||||||
|
|
|
||||||
|
|
@ -75,115 +75,114 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {getDataShowInfo} from '../../api/info'
|
import {getDataShowInfo} from '../../api/info'
|
||||||
export default {
|
export default {
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
userInformation: {
|
userInformation: {
|
||||||
username: '',
|
username: '',
|
||||||
identity: '',
|
identity: '',
|
||||||
email:'',
|
email: '',
|
||||||
phone: '',
|
phone: '',
|
||||||
createTime: ''
|
createTime: ''
|
||||||
},
|
|
||||||
dataShow:{},
|
|
||||||
PhoneFormVisible: false,
|
|
||||||
addressFormVisible: false,
|
|
||||||
changeForm: {
|
|
||||||
newPhone: '',
|
|
||||||
newAddress: ''
|
|
||||||
},
|
|
||||||
rules: {
|
|
||||||
newPhone: [
|
|
||||||
{required: true, message: '请输入手机号', trigger: 'blur'},
|
|
||||||
{pattern: /^1[3-8][0-9]{9}$/, message: '手机号码格式不正确', trigger: 'blur'}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
mounted () {
|
|
||||||
this.getUserInfo()
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
getUserInfo () {
|
|
||||||
let loading = this.$loading({lock: true, text: '玩命加载中...'})
|
|
||||||
|
|
||||||
this.userInformation.username = sessionStorage.getItem('username')
|
|
||||||
this.userInformation.email = sessionStorage.getItem('email')
|
|
||||||
this.userInformation.identity = sessionStorage.getItem('identity')
|
|
||||||
this.userInformation.phone = sessionStorage.getItem('phone')
|
|
||||||
this.userInformation.createTime = sessionStorage.getItem('createTime')
|
|
||||||
getDataShowInfo().then((res)=>{
|
|
||||||
var data = res.data
|
|
||||||
if (data.success){
|
|
||||||
this.dataShow = data.data
|
|
||||||
}
|
|
||||||
})
|
|
||||||
loading.close()
|
|
||||||
},
|
},
|
||||||
handleChangePhone (formName) {
|
dataShow: {},
|
||||||
this.$refs[formName].validate((valid) => {
|
PhoneFormVisible: false,
|
||||||
if (valid) {
|
addressFormVisible: false,
|
||||||
this.PhoneFormVisible = false
|
changeForm: {
|
||||||
// axios.get(`/users/userInformation/ChangePhone?phoneNum=${this.changeForm.newPhone}`)
|
newPhone: '',
|
||||||
// .then(response=>{
|
newAddress: ''
|
||||||
// let res = response.data;
|
|
||||||
// if(res.status=='0'){
|
|
||||||
// this.$message({
|
|
||||||
// message: '恭喜你,修改成功!',
|
|
||||||
// type: 'success',
|
|
||||||
// showClose:true
|
|
||||||
// });
|
|
||||||
// this.getUserInfo();
|
|
||||||
// }else{
|
|
||||||
// console.log(res.msg);
|
|
||||||
// this.$message({
|
|
||||||
// message: '修改失败! 请重试',
|
|
||||||
// type: 'error',
|
|
||||||
// showClose:true
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
// }).catch(err=>{
|
|
||||||
// console.log(err);
|
|
||||||
// })
|
|
||||||
} else {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
},
|
},
|
||||||
handleChangeAddress (formName) {
|
rules: {
|
||||||
this.$refs[formName].validate((valid) => {
|
newPhone: [
|
||||||
if (valid) {
|
{required: true, message: '请输入手机号', trigger: 'blur'},
|
||||||
this.addressFormVisible = false
|
{pattern: /^1[3-8][0-9]{9}$/, message: '手机号码格式不正确', trigger: 'blur'}
|
||||||
// axios.get(`/users/userInformation/ChangeAddress?newAddress=${this.changeForm.newAddress}`)
|
]
|
||||||
// .then(response=>{
|
|
||||||
// let res = response.data;
|
|
||||||
// if(res.status=='0'){
|
|
||||||
// this.$message({
|
|
||||||
// message: '恭喜你,修改成功!',
|
|
||||||
// type: 'success',
|
|
||||||
// showClose:true
|
|
||||||
// });
|
|
||||||
// this.getUserInfo();
|
|
||||||
// }else{
|
|
||||||
// console.log(res.msg);
|
|
||||||
// this.$message({
|
|
||||||
// message: '修改失败! 请重试',
|
|
||||||
// type: 'error',
|
|
||||||
// showClose:true
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
// }).catch(err=>{
|
|
||||||
// console.log(err);
|
|
||||||
// })
|
|
||||||
} else {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
mounted () {
|
||||||
|
this.getUserInfo()
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
getUserInfo () {
|
||||||
|
let loading = this.$loading({lock: true, text: '玩命加载中...'})
|
||||||
|
|
||||||
|
this.userInformation.username = sessionStorage.getItem('username')
|
||||||
|
this.userInformation.email = sessionStorage.getItem('email')
|
||||||
|
this.userInformation.identity = sessionStorage.getItem('identity')
|
||||||
|
this.userInformation.phone = sessionStorage.getItem('phone')
|
||||||
|
this.userInformation.createTime = sessionStorage.getItem('createTime')
|
||||||
|
getDataShowInfo().then((res) => {
|
||||||
|
var data = res.data
|
||||||
|
if (data.success) {
|
||||||
|
this.dataShow = data.data
|
||||||
|
}
|
||||||
|
})
|
||||||
|
loading.close()
|
||||||
|
},
|
||||||
|
handleChangePhone (formName) {
|
||||||
|
this.$refs[formName].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
this.PhoneFormVisible = false
|
||||||
|
// axios.get(`/users/userInformation/ChangePhone?phoneNum=${this.changeForm.newPhone}`)
|
||||||
|
// .then(response=>{
|
||||||
|
// let res = response.data;
|
||||||
|
// if(res.status=='0'){
|
||||||
|
// this.$message({
|
||||||
|
// message: '恭喜你,修改成功!',
|
||||||
|
// type: 'success',
|
||||||
|
// showClose:true
|
||||||
|
// });
|
||||||
|
// this.getUserInfo();
|
||||||
|
// }else{
|
||||||
|
// console.log(res.msg);
|
||||||
|
// this.$message({
|
||||||
|
// message: '修改失败! 请重试',
|
||||||
|
// type: 'error',
|
||||||
|
// showClose:true
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
// }).catch(err=>{
|
||||||
|
// console.log(err);
|
||||||
|
// })
|
||||||
|
} else {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
handleChangeAddress (formName) {
|
||||||
|
this.$refs[formName].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
this.addressFormVisible = false
|
||||||
|
// axios.get(`/users/userInformation/ChangeAddress?newAddress=${this.changeForm.newAddress}`)
|
||||||
|
// .then(response=>{
|
||||||
|
// let res = response.data;
|
||||||
|
// if(res.status=='0'){
|
||||||
|
// this.$message({
|
||||||
|
// message: '恭喜你,修改成功!',
|
||||||
|
// type: 'success',
|
||||||
|
// showClose:true
|
||||||
|
// });
|
||||||
|
// this.getUserInfo();
|
||||||
|
// }else{
|
||||||
|
// console.log(res.msg);
|
||||||
|
// this.$message({
|
||||||
|
// message: '修改失败! 请重试',
|
||||||
|
// type: 'error',
|
||||||
|
// showClose:true
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
// }).catch(err=>{
|
||||||
|
// console.log(err);
|
||||||
|
// })
|
||||||
|
} else {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
<style>
|
<style>
|
||||||
/* // 修改手机弹框 */
|
/* // 修改手机弹框 */
|
||||||
|
|
|
||||||
|
|
@ -105,113 +105,110 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
// import { mapState } from 'vuex'
|
|
||||||
export default {
|
export default {
|
||||||
data(){
|
data () {
|
||||||
return{
|
return {
|
||||||
userInformation:{},
|
userInformation: {},
|
||||||
PhoneFormVisible:false,
|
PhoneFormVisible: false,
|
||||||
addressFormVisible:false,
|
addressFormVisible: false,
|
||||||
changeForm: {
|
changeForm: {
|
||||||
newPhone:'',
|
newPhone: '',
|
||||||
newAddress:''
|
newAddress: ''
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
newPhone: [
|
newPhone: [
|
||||||
{ required: true, message: '请输入手机号', trigger: 'blur' },
|
{ required: true, message: '请输入手机号', trigger: 'blur' },
|
||||||
{ pattern:/^1[3-8][0-9]{9}$/, message: '手机号码格式不正确', trigger: 'blur' }
|
{ pattern: /^1[3-8][0-9]{9}$/, message: '手机号码格式不正确', trigger: 'blur' }
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
|
||||||
},
|
|
||||||
// computed:{
|
|
||||||
// ...mapState({
|
|
||||||
// userId:state=>state.user.userInfo.userId
|
|
||||||
// })
|
|
||||||
// },
|
|
||||||
mounted(){
|
|
||||||
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.userInformation = res.result;
|
|
||||||
this.changeForm.newPhone = res.result.phoneNum;
|
|
||||||
this.changeForm.newAddress = res.result.address;
|
|
||||||
}else{
|
|
||||||
console.log(res.msg);
|
|
||||||
}
|
|
||||||
}).catch(err=>{
|
|
||||||
console.log(err);
|
|
||||||
|
|
||||||
})
|
|
||||||
},
|
|
||||||
handleChangePhone(formName){
|
|
||||||
this.$refs[formName].validate((valid) => {
|
|
||||||
if (valid) {
|
|
||||||
this.PhoneFormVisible = false;
|
|
||||||
axios.get(`/users/userInformation/ChangePhone?phoneNum=${this.changeForm.newPhone}`)
|
|
||||||
.then(response=>{
|
|
||||||
let res = response.data;
|
|
||||||
if(res.status=='0'){
|
|
||||||
this.$message({
|
|
||||||
message: '恭喜你,修改成功!',
|
|
||||||
type: 'success',
|
|
||||||
showClose:true
|
|
||||||
});
|
|
||||||
this.getUserInfo();
|
|
||||||
}else{
|
|
||||||
console.log(res.msg);
|
|
||||||
this.$message({
|
|
||||||
message: '修改失败! 请重试',
|
|
||||||
type: 'error',
|
|
||||||
showClose:true
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}).catch(err=>{
|
|
||||||
console.log(err);
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
},
|
|
||||||
handleChangeAddress(formName){
|
|
||||||
this.$refs[formName].validate((valid) => {
|
|
||||||
if (valid) {
|
|
||||||
this.addressFormVisible = false;
|
|
||||||
axios.get(`/users/userInformation/ChangeAddress?newAddress=${this.changeForm.newAddress}`)
|
|
||||||
.then(response=>{
|
|
||||||
let res = response.data;
|
|
||||||
if(res.status=='0'){
|
|
||||||
this.$message({
|
|
||||||
message: '恭喜你,修改成功!',
|
|
||||||
type: 'success',
|
|
||||||
showClose:true
|
|
||||||
});
|
|
||||||
this.getUserInfo();
|
|
||||||
}else{
|
|
||||||
console.log(res.msg);
|
|
||||||
this.$message({
|
|
||||||
message: '修改失败! 请重试',
|
|
||||||
type: 'error',
|
|
||||||
showClose:true
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}).catch(err=>{
|
|
||||||
console.log(err);
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
// computed:{
|
||||||
|
// ...mapState({
|
||||||
|
// userId:state=>state.user.userInfo.userId
|
||||||
|
// })
|
||||||
|
// },
|
||||||
|
mounted () {
|
||||||
|
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.userInformation = res.result
|
||||||
|
this.changeForm.newPhone = res.result.phoneNum
|
||||||
|
this.changeForm.newAddress = res.result.address
|
||||||
|
} else {
|
||||||
|
console.log(res.msg)
|
||||||
|
}
|
||||||
|
}).catch(err => {
|
||||||
|
console.log(err)
|
||||||
|
})
|
||||||
|
},
|
||||||
|
handleChangePhone (formName) {
|
||||||
|
this.$refs[formName].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
this.PhoneFormVisible = false
|
||||||
|
axios.get(`/users/userInformation/ChangePhone?phoneNum=${this.changeForm.newPhone}`)
|
||||||
|
.then(response => {
|
||||||
|
let res = response.data
|
||||||
|
if (res.status == '0') {
|
||||||
|
this.$message({
|
||||||
|
message: '恭喜你,修改成功!',
|
||||||
|
type: 'success',
|
||||||
|
showClose: true
|
||||||
|
})
|
||||||
|
this.getUserInfo()
|
||||||
|
} else {
|
||||||
|
console.log(res.msg)
|
||||||
|
this.$message({
|
||||||
|
message: '修改失败! 请重试',
|
||||||
|
type: 'error',
|
||||||
|
showClose: true
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}).catch(err => {
|
||||||
|
console.log(err)
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
handleChangeAddress (formName) {
|
||||||
|
this.$refs[formName].validate((valid) => {
|
||||||
|
if (valid) {
|
||||||
|
this.addressFormVisible = false
|
||||||
|
axios.get(`/users/userInformation/ChangeAddress?newAddress=${this.changeForm.newAddress}`)
|
||||||
|
.then(response => {
|
||||||
|
let res = response.data
|
||||||
|
if (res.status == '0') {
|
||||||
|
this.$message({
|
||||||
|
message: '恭喜你,修改成功!',
|
||||||
|
type: 'success',
|
||||||
|
showClose: true
|
||||||
|
})
|
||||||
|
this.getUserInfo()
|
||||||
|
} else {
|
||||||
|
console.log(res.msg)
|
||||||
|
this.$message({
|
||||||
|
message: '修改失败! 请重试',
|
||||||
|
type: 'error',
|
||||||
|
showClose: true
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}).catch(err => {
|
||||||
|
console.log(err)
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style>
|
<style>
|
||||||
|
|
@ -2,6 +2,20 @@
|
||||||
<div class="currentorder">
|
<div class="currentorder">
|
||||||
<person-title>当前位置 :: 我的订单 >> <em>所有订单</em></person-title>
|
<person-title>当前位置 :: 我的订单 >> <em>所有订单</em></person-title>
|
||||||
<div class="currentorder-cont">
|
<div class="currentorder-cont">
|
||||||
|
<el-row>
|
||||||
|
<el-col :offset="10" :span="4">
|
||||||
|
<el-select v-model="value" placeholder="请选择">
|
||||||
|
<el-option
|
||||||
|
v-for="item in options"
|
||||||
|
:key="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value">
|
||||||
|
</el-option>
|
||||||
|
</el-select></el-col>
|
||||||
|
<el-col :span="4">
|
||||||
|
<el-input v-model="input" placeholder="请输入内容"></el-input>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
<el-table
|
<el-table
|
||||||
:data="CompOrderData"
|
:data="CompOrderData"
|
||||||
class="userOrderList"
|
class="userOrderList"
|
||||||
|
|
|
||||||
|
|
@ -28,83 +28,68 @@ import leftMenu from '../LeftMenu'
|
||||||
import appFooter from '../../AppFooter'
|
import appFooter from '../../AppFooter'
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
export default {
|
export default {
|
||||||
components:{
|
components: {
|
||||||
leftMenu,
|
leftMenu,
|
||||||
appFooter
|
appFooter
|
||||||
},
|
},
|
||||||
data(){
|
data () {
|
||||||
return{
|
return {
|
||||||
leftMenuData:[
|
leftMenuData: [
|
||||||
{
|
{
|
||||||
index:"1",
|
index: '1',
|
||||||
icon:'el-icon-location',
|
icon: 'el-icon-location',
|
||||||
title:'个人中心',
|
title: '个人中心',
|
||||||
menuItem:[
|
menuItem: [
|
||||||
{route:'userinfo',listTitle:'我的信息'},
|
{route: 'userinfo', listTitle: '我的信息'},
|
||||||
{route:'changepassword',listTitle:'修改密码'},
|
{route: 'changepassword', listTitle: '修改密码'},
|
||||||
{route:'addinfo',listTitle:'完善个人信息'}
|
{route: 'addinfo', listTitle: '完善个人信息'}
|
||||||
|
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
index:"2",
|
|
||||||
icon:'el-icon-tickets',
|
|
||||||
title:'我的订单',
|
|
||||||
menuItem:[
|
|
||||||
{route:'currentorder',listTitle:'所有订单'},
|
|
||||||
{route:'addorder',listTitle:'发布订单'},
|
|
||||||
{route:'horder',listTitle:'历史订单'},
|
|
||||||
{route:'userorder',listTitle:'查找订单'}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
index:"3",
|
|
||||||
icon:'el-icon-message',
|
|
||||||
title:'我的消息',
|
|
||||||
menuItem:[
|
|
||||||
{route:'mymeg',listTitle:'消息'}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
index:"4",
|
|
||||||
icon:'el-icon-edit-outline',
|
|
||||||
title:'加入我们',
|
|
||||||
menuItem:[
|
|
||||||
{route:'ju',listTitle:'申请'}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
isCollapse:false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
methods:{
|
|
||||||
checkLogin(){
|
|
||||||
let loading = this.$loading({lock:true,text:'正在加载...'});
|
|
||||||
axios.get("/users/checkLogin").then((response)=>{
|
|
||||||
let res = response.data;
|
|
||||||
loading.close();
|
|
||||||
if(res.status=="0"){
|
|
||||||
|
|
||||||
}else{
|
|
||||||
this.$message({
|
|
||||||
message: '当前未登录!',
|
|
||||||
type: 'error',
|
|
||||||
showClose:true
|
|
||||||
});
|
|
||||||
this.$router.push({ path: '/login' });
|
|
||||||
}
|
|
||||||
}).catch(err=>{
|
|
||||||
loading.close();
|
|
||||||
console.log(err);
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
handleIsCollapse(newVal){
|
{
|
||||||
this.isCollapse = newVal;
|
index: '2',
|
||||||
|
icon: 'el-icon-tickets',
|
||||||
|
title: '我的订单',
|
||||||
|
menuItem: [
|
||||||
|
{route: 'currentorder', listTitle: '所有订单'},
|
||||||
|
{route: 'addorder', listTitle: '发布订单'},
|
||||||
|
{route: 'horder', listTitle: '历史订单'},
|
||||||
|
{route: 'userorder', listTitle: '查找订单'}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
index: '3',
|
||||||
|
icon: 'el-icon-message',
|
||||||
|
title: '我的消息',
|
||||||
|
menuItem: [
|
||||||
|
{route: 'mymeg', listTitle: '消息'}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
index: '4',
|
||||||
|
icon: 'el-icon-edit-outline',
|
||||||
|
title: '加入我们',
|
||||||
|
menuItem: [
|
||||||
|
{route: 'ju', listTitle: '申请'}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
},
|
],
|
||||||
created() {
|
isCollapse: false
|
||||||
this.checkLogin();
|
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
checkLogin () {
|
||||||
|
let loading = this.$loading({lock: true, text: '正在加载...'})
|
||||||
|
|
||||||
|
loading.close()
|
||||||
|
},
|
||||||
|
handleIsCollapse (newVal) {
|
||||||
|
this.isCollapse = newVal
|
||||||
|
}
|
||||||
|
},
|
||||||
|
created () {
|
||||||
|
this.checkLogin()
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
const adminLogin = resolve => require(['@ctsAdmin/admin_login'], resolve),
|
|
||||||
adminPage = resolve => require(['@ctsAdmin/adminPage'], resolve),
|
|
||||||
findPeople = resolve => require(['@ctsAdmin/allPerson/findPeople'], resolve),
|
|
||||||
allUser = resolve => require(['@ctsAdmin/allPerson/allUser'], resolve),
|
|
||||||
allWoker = resolve => require(['@ctsAdmin/allPerson/allWoker'], resolve),
|
|
||||||
findOneOrder = resolve => require(['@ctsAdmin/allOrder/findOneOrder'], resolve),
|
|
||||||
allNotReceiveOrder = resolve => require(['@ctsAdmin/allOrder/allNotReceiveOrder'], resolve),
|
|
||||||
allReceivedOrder = resolve => require(['@ctsAdmin/allOrder/allReceivedOrder'], resolve),
|
|
||||||
allHistoryOrder = resolve => require(['@ctsAdmin/allOrder/allHistoryOrder'], resolve),
|
|
||||||
sendMessage = resolve => require(['@ctsAdmin/message/sendMessage'], resolve),
|
|
||||||
joinUsApply = resolve => require(['@ctsAdmin/joinUS/joinUsApply'], resolve),
|
|
||||||
joinUsHistoryApply = resolve => require(['@ctsAdmin/joinUS/joinUsHistoryApply'], resolve),
|
|
||||||
suggestList = resolve => require(['@ctsAdmin/suggestList'], resolve);
|
|
||||||
|
|
||||||
export {adminLogin ,adminPage ,findPeople ,allUser ,allWoker ,findOneOrder ,allNotReceiveOrder ,
|
|
||||||
allReceivedOrder ,allHistoryOrder ,sendMessage ,joinUsApply ,joinUsHistoryApply ,suggestList}
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
import Vue from 'vue'
|
import Vue from 'vue'
|
||||||
import Router from 'vue-router'
|
import Router from 'vue-router'
|
||||||
|
|
||||||
|
|
||||||
Vue.use(Router)
|
Vue.use(Router)
|
||||||
|
|
||||||
const router = new Router({
|
const router = new Router({
|
||||||
|
|
@ -9,246 +8,250 @@ const router = new Router({
|
||||||
routes: [
|
routes: [
|
||||||
{
|
{
|
||||||
path: '/',
|
path: '/',
|
||||||
redirect:'home'
|
redirect: 'home'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/home',
|
path: '/home',
|
||||||
name:'apphome',
|
name: 'apphome',
|
||||||
components:{
|
components: {
|
||||||
default:()=>import('@com/home/Home'),
|
default: () => import('@com/home/Home'),
|
||||||
header:()=>import('@com/AppHeader'),
|
header: () => import('@com/AppHeader'),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/login',
|
path: '/login',
|
||||||
component:()=>import('@com/loginregister/LoginRegister'),
|
component: () => import('@com/loginregister/LoginRegister'),
|
||||||
children:[
|
children: [
|
||||||
{
|
{
|
||||||
path:'/',
|
path: '/',
|
||||||
component:()=>import('@com/loginregister/Login'),
|
component: () => import('@com/loginregister/Login'),
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/register',
|
path: '/register',
|
||||||
component:()=>import('@com/loginregister/LoginRegister'),
|
component: () => import('@com/loginregister/LoginRegister'),
|
||||||
children:[
|
children: [
|
||||||
{
|
{
|
||||||
path:'/',
|
path: '/',
|
||||||
component:()=>import('@com/loginregister/Register'),
|
component: () => import('@com/loginregister/Register'),
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/forgot',
|
path: '/forgot',
|
||||||
component:()=>import('@com/loginregister/LoginRegister'),
|
component: () => import('@com/loginregister/LoginRegister'),
|
||||||
children:[
|
children: [
|
||||||
{
|
{
|
||||||
path:'/',
|
path: '/',
|
||||||
component:()=>import('@com/loginregister/ForgotPassword'),
|
component: () => import('@com/loginregister/ForgotPassword'),
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/person',
|
path: '/person',
|
||||||
components:{
|
components: {
|
||||||
default:()=>import('@compage/user/User'),
|
default: () => import('@compage/user/User'),
|
||||||
header:()=>import('@com/AppHeader'),
|
header: () => import('@com/AppHeader'),
|
||||||
},
|
},
|
||||||
children:[
|
children: [
|
||||||
{
|
{
|
||||||
path:'/',
|
path: '/',
|
||||||
redirect:'userinfo'
|
redirect: 'userinfo'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'userinfo',
|
path: 'userinfo',
|
||||||
component:()=>import('@compage/UserInfo')
|
component: () => import('@compage/UserInfo')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'addinfo',
|
path: 'addinfo',
|
||||||
component:()=>import('@compage/user/AddInfo')
|
component: () => import('@compage/user/AddInfo')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'changepassword',
|
path: 'changepassword',
|
||||||
component:()=>import('@compage/ChangePassword'),
|
component: () => import('@compage/ChangePassword'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'currentorder',
|
path: 'currentorder',
|
||||||
component:()=>import('@compage/user/CurrentOrder'),
|
component: () => import('@compage/user/CurrentOrder'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'addorder',
|
path: 'addorder',
|
||||||
component:()=>import('@compage/user/AddOrder'),
|
component: () => import('@compage/user/AddOrder'),
|
||||||
meta: {
|
meta: {
|
||||||
keepAlive: true
|
keepAlive: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'horder',
|
path: 'horder',
|
||||||
component:()=>import('@compage/user/HOrder'),
|
component: () => import('@compage/user/HOrder'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'userorder',
|
path: 'userorder',
|
||||||
component:()=>import('@compage/user/UserOrder'),
|
component: () => import('@compage/user/UserOrder'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'mymeg',
|
path: 'mymeg',
|
||||||
component:()=>import('@compage/MyMessage'),
|
component: () => import('@compage/MyMessage'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'ju',
|
path: 'ju',
|
||||||
component:()=>import('@compage/user/JoinUs'),
|
component: () => import('@compage/user/JoinUs'),
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/woker',
|
path: '/woker',
|
||||||
components:{
|
components: {
|
||||||
default:()=>import('@compage/woker/Woker'),
|
default: () => import('@compage/woker/Woker'),
|
||||||
header:()=>import('@com/AppHeader'),
|
header: () => import('@com/AppHeader'),
|
||||||
},
|
},
|
||||||
children:[
|
children: [
|
||||||
{
|
{
|
||||||
path:'/',
|
path: '/',
|
||||||
redirect:'userinfo'
|
redirect: 'userinfo'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'userinfo',
|
path: 'userinfo',
|
||||||
component:()=>import('@compage/UserInfo')
|
component: () => import('@compage/UserInfo')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'changepassword',
|
path: 'changepassword',
|
||||||
component:()=>import('@compage/ChangePassword')
|
component: () => import('@compage/ChangePassword')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'wa',
|
path: 'wa',
|
||||||
component:()=>import('@compage/woker/WokerAccount')
|
component: () => import('@compage/woker/WokerAccount')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'wro',
|
path: 'wro',
|
||||||
component:()=>import('@compage/woker/WokerReceivedOrder')
|
component: () => import('@compage/woker/WokerReceivedOrder')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'who',
|
path: 'who',
|
||||||
component:()=>import('@compage/woker/WokerHistoryOrder')
|
component: () => import('@compage/woker/WokerHistoryOrder')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'wfo',
|
path: 'wfo',
|
||||||
component:()=>import('@compage/woker/WokerFindOrder')
|
component: () => import('@compage/woker/WokerFindOrder')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'auol',
|
path: 'auol',
|
||||||
component:()=>import('@compage/woker/AllUserOrderList')
|
component: () => import('@compage/woker/AllUserOrderList')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'mymeg',
|
path: 'mymeg',
|
||||||
component:()=>import('@compage/MyMessage')
|
component: () => import('@compage/MyMessage')
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/rootlogin',
|
path: '/rootlogin',
|
||||||
component:()=>import('@comadmin/AdminLogin')
|
component: () => import('@comadmin/AdminLogin')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/admin',
|
path: '/admin',
|
||||||
component:()=>import('@comadmin/AdminPage'),
|
component: () => import('@comadmin/AdminPage'),
|
||||||
children:[
|
children: [
|
||||||
{
|
{
|
||||||
path:'/',
|
path: '/',
|
||||||
redirect:'au'
|
redirect: 'au'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'au',
|
path: 'au',
|
||||||
component:()=>import('@comadmin/allperson/AllUser')
|
component: () => import('@comadmin/allperson/AllUser')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'aw',
|
path: 'aw',
|
||||||
component:()=>import('@comadmin/allperson/AllWoker')
|
component: () => import('@comadmin/allperson/AllWoker')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'fp',
|
path: 'fp',
|
||||||
component:()=>import('@comadmin/allperson/FindPeople')
|
component: () => import('@comadmin/allperson/FindPeople')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'foo',
|
path: 'foo',
|
||||||
component:()=>import('@comadmin/allorder/findOneOrder')
|
component: () => import('@comadmin/allorder/findOneOrder')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'anro',
|
path: 'anro',
|
||||||
component:()=>import('@comadmin/allorder/AllNotReceiveOrder')
|
component: () => import('@comadmin/allorder/AllNotReceiveOrder')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'aro',
|
path: 'aro',
|
||||||
component:()=>import('@comadmin/allorder/AllReceivedOrder')
|
component: () => import('@comadmin/allorder/AllReceivedOrder')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'aho',
|
path: 'aho',
|
||||||
component:()=>import('@comadmin/allorder/AllHistoryOrder')
|
component: () => import('@comadmin/allorder/AllHistoryOrder')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'sm',
|
path: 'sm',
|
||||||
component:()=>import('@comadmin/message/SendMessage')
|
component: () => import('@comadmin/message/SendMessage')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'jua',
|
path: 'jua',
|
||||||
component:()=>import('@comadmin/joinus/JoinUsApply')
|
component: () => import('@comadmin/joinus/JoinUsApply')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'jha',
|
path: 'jha',
|
||||||
component:()=>import('@comadmin/joinus/JoinUsHistoryApply')
|
component: () => import('@comadmin/joinus/JoinUsHistoryApply')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path:'sl',
|
path: 'sl',
|
||||||
component:()=>import('@comadmin/SuggestList')
|
component: () => import('@comadmin/SuggestList')
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/aboutus',
|
path: '/aboutus',
|
||||||
name:'AboutUs',
|
name: 'AboutUs',
|
||||||
components:{
|
components: {
|
||||||
default:()=>import('@com/aboutUs/AboutUs'),
|
default: () => import('@com/aboutUs/AboutUs'),
|
||||||
header:()=>import('@com/AppHeader'),
|
header: () => import('@com/AppHeader'),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/customerservice',
|
path: '/customerservice',
|
||||||
name:'CustomerService',
|
name: 'CustomerService',
|
||||||
components:{
|
components: {
|
||||||
default:()=>import('@com/customerservice/CustomerService'),
|
default: () => import('@com/customerservice/CustomerService'),
|
||||||
header:()=>import('@com/AppHeader'),
|
header: () => import('@com/AppHeader'),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/suggest',
|
path: '/suggest',
|
||||||
name:'suggest',
|
name: 'suggest',
|
||||||
components:{
|
components: {
|
||||||
default:()=>import('@com/suggest/Suggest'),
|
default: () => import('@com/suggest/Suggest'),
|
||||||
header:()=>import('@com/AppHeader'),
|
header: () => import('@com/AppHeader'),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '*',
|
path: '*',
|
||||||
name:'404',
|
name: '404',
|
||||||
component:()=>import('@com/error/404')
|
component: () => import('@com/error/404')
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
router.beforeEach((to, from, next) => {
|
router.beforeEach((to, from, next) => {
|
||||||
var identity = sessionStorage.getItem('identity')
|
var identity = sessionStorage.getItem('identity')
|
||||||
if (!identity) {
|
if (!identity) {
|
||||||
if (to.path.indexOf('person')==1|to.path.indexOf('woker')==1) {
|
// eslint-disable-next-line eqeqeq
|
||||||
|
if (to.path.indexOf('person') == 1 | to.path.indexOf('woker') == 1) {
|
||||||
return next('/login')
|
return next('/login')
|
||||||
}
|
}
|
||||||
if (to.path.indexOf('admin')==1) {
|
// eslint-disable-next-line eqeqeq
|
||||||
|
if (to.path.indexOf('admin') == 1) {
|
||||||
return next('/rootlogin')
|
return next('/rootlogin')
|
||||||
}
|
}
|
||||||
}else {
|
} else {
|
||||||
if ((!to.path.indexOf('person')==1&&!identity==3)||(!to.path.indexOf('woker')==1&&!identity==2)){
|
// eslint-disable-next-line eqeqeq
|
||||||
|
if ((!to.path.indexOf('person') == 1 && !identity == 3) || (!to.path.indexOf('woker') == 1 && !identity == 2)) {
|
||||||
return next('/login')
|
return next('/login')
|
||||||
}
|
}
|
||||||
if (!to.path.indexOf('admin')==1&&!identity==1){
|
// eslint-disable-next-line eqeqeq
|
||||||
|
if (!to.path.indexOf('admin') == 1 && !identity == 1) {
|
||||||
return next('/rootlogin')
|
return next('/rootlogin')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
const loginRegister = resolve => require(['@cts/loginRegister/loginRegister'], resolve),
|
|
||||||
login = resolve => require(['@cts/loginRegister/login'], resolve),
|
|
||||||
register = resolve => require(['@cts/loginRegister/register'], resolve),
|
|
||||||
forgotPassword = resolve => require(['@cts/loginRegister/forgotPassword'], resolve),
|
|
||||||
changePassword = resolve => require(['@cts/personPage/changePassword'], resolve),
|
|
||||||
appHeader = resolve => require(['@cts/appHeader'], resolve),
|
|
||||||
appHome = resolve => require(['@cts/home/home'], resolve),
|
|
||||||
aboutUs = resolve => require(['@cts/aboutUs/aboutUs'], resolve),
|
|
||||||
customerService = resolve => require(['@cts/customerService/customerService'], resolve),
|
|
||||||
suggest = resolve => require(['@cts/suggest/suggest'], resolve),
|
|
||||||
notFound = resolve => require(['@cts/error/404'], resolve);
|
|
||||||
|
|
||||||
export {loginRegister ,login ,register ,forgotPassword ,changePassword,
|
|
||||||
appHeader ,appHome ,aboutUs ,customerService ,suggest ,notFound }
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
const userPage = resolve => require(['@ctsPage/user/user'], resolve),
|
|
||||||
userInformation = resolve => require(['@ctsPage/userInformation'], resolve),
|
|
||||||
addInformation = resolve => require(['@ctsPage/user/addInformation'], resolve),
|
|
||||||
currentOrder = resolve => require(['@ctsPage/user/currentOrder'], resolve),
|
|
||||||
joinUs = resolve => require(['@ctsPage/user/joinUs'], resolve),
|
|
||||||
newOrder = resolve => require(['@ctsPage/user/newOrder'], resolve),
|
|
||||||
userFindOrder = resolve => require(['@ctsPage/user/userFindOrder'], resolve),
|
|
||||||
historyOrder = resolve => require(['@ctsPage/user/historyOrder'], resolve),
|
|
||||||
myMessage = resolve => require(['@ctsPage/myMessage'], resolve);
|
|
||||||
|
|
||||||
export {userPage ,userInformation ,addInformation ,
|
|
||||||
currentOrder ,joinUs ,newOrder ,historyOrder ,myMessage ,userFindOrder}
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
const wokerPage = resolve => require(['@ctsPage/woker/woker'], resolve),
|
|
||||||
wokerAccount = resolve => require(['@ctsPage/woker/wokerAccount'], resolve),
|
|
||||||
wokerReceivedOrder = resolve => require(['@ctsPage/woker/wokerReceivedOrder'], resolve),
|
|
||||||
wokerHistoryOrder = resolve => require(['@ctsPage/woker/wokerHistoryOrder'], resolve),
|
|
||||||
allUserOrderList = resolve => require(['@ctsPage/woker/allUserOrderList'], resolve),
|
|
||||||
wokerFindOrder = resolve => require(['@ctsPage/woker/wokerFindOrder'], resolve);
|
|
||||||
|
|
||||||
export {wokerPage ,wokerAccount ,wokerReceivedOrder ,
|
|
||||||
wokerHistoryOrder ,allUserOrderList ,wokerFindOrder}
|
|
||||||
Loading…
Reference in New Issue