Commit ee8bf30e by yanju

config

parent 2007e73a
export default { export default {
ip:'http://localhost:8081', ip:'http://opensource.yundingshuyuan.com',
api:{ api:{
get:{ get:{
...@@ -83,7 +83,6 @@ export default { ...@@ -83,7 +83,6 @@ export default {
list:'/api/project/',//项目评论列表 +{projectId}/comments list:'/api/project/',//项目评论列表 +{projectId}/comments
}, },
}, },
post:{ post:{
Post:{ Post:{
release:'/api/post',//发布动态 release:'/api/post',//发布动态
...@@ -143,7 +142,6 @@ export default { ...@@ -143,7 +142,6 @@ export default {
list:'/api/project/',//项目发表评论 +{projectId}/comment list:'/api/project/',//项目发表评论 +{projectId}/comment
}, },
}, },
delete:{ delete:{
Post:{ Post:{
delete:'/api/post/',//删除动态 +{postId} delete:'/api/post/',//删除动态 +{postId}
...@@ -225,6 +223,7 @@ export default { ...@@ -225,6 +223,7 @@ export default {
}, },
tokenName:'BC_token',
} }
} }
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
import config from './config'; import config from './config';
import axios from 'axios'; import axios from 'axios';
const baseUrl = config.ip; const baseUrl = config.ip;
import state from '../store/state';
/** /**
* ajax请求封装 * ajax请求封装
...@@ -10,16 +9,22 @@ import state from '../store/state'; ...@@ -10,16 +9,22 @@ import state from '../store/state';
* @param options * @param options
* @returns {Promise<any>} * @returns {Promise<any>}
*/ */
const requests = (url, options) => {
axios.interceptors.request.use(axiosConfig => {
if(process.browser){
var token = localStorage.getItem(config.default_data.tokenName);
}
if (token) {
axiosConfig.headers['Authorization'] = 'Bearer ' + token;
}
return axiosConfig;
});
const requests = (url, options) => {
const defaultHeaders = { const defaultHeaders = {
"Content-Type": "application/json" "Content-Type": "application/json"
}; };
let accessToken = state().token;
if (accessToken) {
defaultHeaders.token = accessToken;
}
const { const {
method = "GET", method = "GET",
headers = options.headers||defaultHeaders, headers = options.headers||defaultHeaders,
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<yun-input @click.native="$router.push('/search')" iconName="search" width='212px' placeholder="请输入关键词" v-model="searchValue"></yun-input> <yun-input @click.native="$router.push('/search')" iconName="search" width='212px' placeholder="请输入关键词" v-model="searchValue"></yun-input>
</div> </div>
<div class="header-center-r" v-if="!user_id"> <div class="header-center-r" v-if="!this.$store.user_id">
<div></div> <div></div>
<p class="login-word"> <p class="login-word">
<span> <span>
...@@ -61,12 +61,12 @@ ...@@ -61,12 +61,12 @@
</p> </p>
</div> </div>
<div class="header-center-r" v-if="user_id"> <div class="header-center-r" v-if="this.$store.user_id">
<yun-icon name="add" color="#ccc" hoverColor="#8CD88C" <yun-icon name="add" color="#ccc" hoverColor="#8CD88C"
@mouseover.native="changeStateShowBox(1)" @mouseleave.native="changeStateHideBox(1)"></yun-icon> @mouseover.native="changeStateShowBox(1)" @mouseleave.native="changeStateHideBox(1)"></yun-icon>
<yun-icon name="notification" color="#ccc" hoverColor="#F8A06F" <yun-icon name="notification" color="#ccc" hoverColor="#F8A06F"
@mouseover.native="changeStateShowBox(3)" @mouseleave.native="changeStateHideBox(3)"></yun-icon> @mouseover.native="changeStateShowBox(3)" @mouseleave.native="changeStateHideBox(3)"></yun-icon>
<img class="user-photo" @mouseleave="changeStateHideBox(2)" :src="photo" alt="" @mouseover="changeStateShowBox(2)"> <img class="user-photo" @mouseleave="changeStateHideBox(2)" :src="this.$store.user_avatar" alt="" @mouseover="changeStateShowBox(2)">
<transition name="fade"> <transition name="fade">
<ul class="abs-box abs-box1" v-if="showHideBox1" @mouseover="changeStateShowBox(1)" @mouseleave="changeStateHideBox(1)"> <ul class="abs-box abs-box1" v-if="showHideBox1" @mouseover="changeStateShowBox(1)" @mouseleave="changeStateHideBox(1)">
<li> <li>
...@@ -128,6 +128,8 @@ ...@@ -128,6 +128,8 @@
<script> <script>
import AlertsCard from './alertsMessage/alertsCard'; import AlertsCard from './alertsMessage/alertsCard';
import config from '../../action/config';
import {get} from '../../action/request';
export default { export default {
name:'container-header', name:'container-header',
...@@ -160,6 +162,7 @@ ...@@ -160,6 +162,7 @@
}, },
mounted(){ mounted(){
this.getUserInfo();
}, },
...@@ -217,6 +220,24 @@ ...@@ -217,6 +220,24 @@
this.showHideBox3=true this.showHideBox3=true
} }
}, },
routeToHome(){
console.log();
this.$router.push('/home');
},
getUserInfo(){
get(config.api.get.User.myInfo).then((data)=>{
if(data.code===0){
this.$store.user_id = data.data.nickName;
this.$store.user_name = data.data.nickName;
this.$store.user_avatar = data.data.userAvatar;
this.$store.gender = data.data.gender;
}else{
localStorage.setItem(config.default_data.tokenName,'')
}
})
}
}, },
} }
</script> </script>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
export default { export default {
name:'pagination', name:'pagination',
props:{ props:{
pages:Number, pages:[Number,String],
}, },
data(){ data(){
return { return {
...@@ -56,11 +56,8 @@ ...@@ -56,11 +56,8 @@
} }
return arr return arr
} }
} }
} }
}, },
methods:{ methods:{
......
export default { export default {
changeStateToken(state,token){ changeToken(state,token){
state.token = token state.token = token
} },
changeUserName(state,user_name){
state.user_name = user_name
},
changeAvatar(state,user_avatar){
state.user_avatar = user_avatar
},
changeUserId(state,userId){
state.userId = userId
},
changeGender(state,gender){
state.gender = gender
},
} }
export default () =>({ export default () =>({
token:'', token:'',
user_id:'', user_id:'',
user_name:'',
user_avatar:'',
gender:''
}) })
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment