Skip to content

Commit

Permalink
base commit
Browse files Browse the repository at this point in the history
  • Loading branch information
kk-cwh committed Apr 6, 2018
1 parent 4c23fbc commit 628056b
Show file tree
Hide file tree
Showing 6 changed files with 435 additions and 207 deletions.
2 changes: 1 addition & 1 deletion config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ module.exports = {
//匹配代理的url
'/api': {
// 目标服务器地址
target: "https://zhangyake.site",
target: "http://blog56.lara",
pathRewrite: {"^/api" : "/api"},
secure: false, // 接受 运行在 https 上的服务
changeOrigin: true
Expand Down
52 changes: 52 additions & 0 deletions src/libs/http.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import axios from 'axios'
import Cookies from 'js-cookie';
let http = axios.create({
timeout: 5000
})
// Add a request interceptor
http.interceptors.request.use(function (config) {
// Do something before request is sent
let token = Cookies.get('token');
if (token) {
config.headers['Authorization'] = token;
}
config.headers['Content-Type'] = 'application/json'
return config
}, function (error) {
// Do something with request error
return Promise.reject(error)
})

// Add a response interceptor
http.interceptors.response.use(function (response) {
// Do something with response data
return response
}, function (error) {
// console.log(JSON.stringify(error))
if (error && error.response) {
if (error.response.status === 401) {
Message.error({
content: ' 401 not auth',
duration: 10
})
}
if (error.response.status === 404) {
Message.error({
content: ' 404 not found',
duration: 10
})
}

if (error.response.status === 500) {
Message.error({
content: ' 500 system error ',
duration: 10
})
}
}

// Do something with response error
return Promise.reject(error)
})

export default http
6 changes: 0 additions & 6 deletions src/libs/util.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import axios from 'axios';

import semver from 'semver';
import packjson from '../../package.json';

Expand All @@ -11,10 +9,6 @@ util.title = function (title) {
window.document.title = title;
};

util.ajax = axios.create({
timeout: 30000
});

util.inOf = function (arr, targetArr) {
let res = true;
arr.forEach(item => {
Expand Down
167 changes: 165 additions & 2 deletions src/store/modules/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import {otherRouter, appRouter} from '@/router/router';

import util from '@/libs/util';
import Cookies from 'js-cookie';
// import Vue from 'vue';
import http from '@/libs/http.js';

const app = {
state: {
username:'',
dashData:{userNumber:11,browNumber:4988,articleNumber:50,discussionNumber:20},
cachePage: [],
isFullScreen: false,
Expand Down Expand Up @@ -166,7 +167,169 @@ const app = {
state.pageOpenedList.push(tagObj);
localStorage.pageOpenedList = JSON.stringify(state.pageOpenedList);
}
}
},
actions: {
Login ({ commit }, userInfo) {
return new Promise((resolve, reject) => {
http({
url: '/api/login',
method: 'post',
data: userInfo
}).then(response => {
if (response.data) {
const data = response.data
Cookies.set('token',data.token_type + ' ' + data.access_token)
Cookies.set('access', 0);
Cookies.set('user', userInfo.username);
resolve();
}
}).catch(error => {
reject(error);
})
})
},
GetUserInfo ({ commit }) {
return new Promise((resolve, reject) => {
http({
url: '/api/user_info',
method: 'get'
}).then(response => {
if (response.data) {
let data = response.data
let user = data.data;
commit('setAvator',"https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3448484253,3685836170&fm=27&gp=0.jpg")

this.state.username = user.name

resolve()
}
}).catch(error => {
reject(error)
})
})
},
// Logout ({ commit }) {
// return new Promise((resolve, reject) => {
// http({
// url: '/api/logout',
// method: 'post'
// }).then(response => {
// if (response.data) {
// // console.log(response.data)

// removeToken()
// commit('CLEAR_STATE')
// console.log(this.state)
// resolve()
// }
// }).catch(error => {
// reject(error)
// })
// })
// },
UserList ({ commit }, data) {
return new Promise((resolve, reject) => {
http({
url: `/api/users?page=${data.page}`,
method: 'get'
}).then(response => {
if (response.data) {
resolve(response.data)
}
}).catch(error => {
reject(error)
})
})
},
// AddUser ({ commit }, userInfo) {
// return new Promise((resolve, reject) => {
// http({
// url: '/api/users',
// method: 'post',
// data: userInfo
// }).then(response => {
// if (response.data) {
// resolve(response.data)
// }
// }).catch(error => {
// reject(error)
// })
// })
// },
// TypeList ({ commit }) {
// return new Promise((resolve, reject) => {
// http({
// url: '/api/types',
// method: 'get'
// }).then(response => {
// if (response.data) {
// resolve(response.data)
// }
// }).catch(error => {
// reject(error)
// })
// })
// },
// AddArticle ({ commit }, article) {
// return new Promise((resolve, reject) => {
// http({
// url: '/api/articles',
// method: 'post',
// data: article
// }).then(response => {
// if (response.data) {
// resolve(response)
// }
// }).catch(error => {
// reject(error)
// })
// })
// },
// UpdateArticle ({ commit }, article) {
// return new Promise((resolve, reject) => {
// http({
// url: `/api/articles/${article.id}`,
// method: 'put',
// data: article
// }).then(response => {
// if (response.data) {
// resolve(response)
// }
// }).catch(error => {
// reject(error)
// })
// })
// },
// GetArticleDetail ({ commit }, data) {
// return new Promise((resolve, reject) => {
// http({
// url: `/api/articles/${data.id}`,
// method: 'get'
// }).then(response => {
// if (response.data) {
// const data = response.data
// resolve(data)
// }
// }).catch(error => {
// reject(error)
// })
// })
// },
// ArticleList ({ commit }, data) {
// return new Promise((resolve, reject) => {
// http({
// url: `/api/articles?page=${data.page}`,
// method: 'get'
// }).then(response => {
// if (response.data) {
// resolve(response.data)
// }
// }).catch(error => {
// reject(error)
// })
// })
// }
}
};

export default app;
90 changes: 44 additions & 46 deletions src/views/login.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<style lang="less" scoped>
@import './login.less';
@import "./login.less";
</style>

<template>
Expand All @@ -14,16 +14,16 @@
<Form ref="loginForm" :model="form" :rules="rules">
<FormItem prop="userName">
<Input v-model="form.userName" placeholder="请输入用户名">
<span slot="prepend">
<Icon :size="16" type="person"></Icon>
</span>
<span slot="prepend">
<Icon :size="16" type="person"></Icon>
</span>
</Input>
</FormItem>
<FormItem prop="password">
<Input type="password" v-model="form.password" placeholder="请输入密码">
<span slot="prepend">
<Icon :size="14" type="locked"></Icon>
</span>
<span slot="prepend">
<Icon :size="14" type="locked"></Icon>
</span>
</Input>
</FormItem>
<FormItem>
Expand All @@ -38,50 +38,48 @@
</template>

<script>
import Cookies from 'js-cookie';
import Cookies from "js-cookie";
// import util from '@/libs/util.js';
import axios from 'axios';
import axios from "axios";
export default {
data () {
return {
form: {
userName: 'iview_admin',
password: ''
},
rules: {
userName: [
{ required: true, message: '账号不能为空', trigger: 'blur' }
],
password: [
{ required: true, message: '密码不能为空', trigger: 'blur' }
]
}
};
},
methods: {
handleSubmit () {
this.$refs.loginForm.validate((valid) => {
if (valid) {
axios.get('/api/_articles?page=1').then(function (response) {
console.log(response);
}).catch(function (error) {
console.log(error);
});
Cookies.set('user', this.form.userName);
Cookies.set('password', this.form.password);
this.$store.commit('setAvator', 'https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3448484253,3685836170&fm=27&gp=0.jpg');
if (this.form.userName === 'iview_admin') {
Cookies.set('access', 0);
} else {
Cookies.set('access', 1);
}
this.$router.push({
name: 'home_index'
});
}
data() {
return {
form: {
userName: "admin",
password: "admin"
},
rules: {
userName: [
{ required: true, message: "账号不能为空", trigger: "blur" }
],
password: [{ required: true, message: "密码不能为空", trigger: "blur" }]
}
};
},
methods: {
handleSubmit() {
this.$refs.loginForm.validate(valid => {
if (valid) {
this.$store
.dispatch("Login",{
username: this.form.userName,
password: this.form.password
})
.then(() => {
this.$store.dispatch("GetUserInfo").then(() => {
this.$Message.success("Success!");
this.$router.push({name: "home_index"});
});
})
.catch(() => {
this.$Message.error("Login Fail!");
});
}
});
}
}
};
</script>

Expand Down
Loading

0 comments on commit 628056b

Please sign in to comment.