9.15

src/components/common/Header.vue

@@ -11,7 +11,7 @@
             <div class="header-user-con">
 				<!--  -->
 				<div class="serve">客服电话：4006661234</div>
-				<div class="official">官网首页</div>
+				<div class="official" @click="join">官网首页</div>
                 <!-- 全屏显示 -->
                 <div class="btn-fullscreen" @click="handleFullScreen">
                     <el-tooltip effect="dark" :content="fullscreen?`取消全屏`:`全屏`" placement="bottom">
@@ -58,7 +58,9 @@ export default {
     
     },
     methods: {
-       
+       join(){
+		   window.location.href="http://192.168.200.201:8081/"
+	   },
         // 用户名下拉菜单选择事件
         handleCommand(command) {
             if (command == 'loginout') {

src/components/common/Home.vue

@@ -3,15 +3,15 @@
         <v-head></v-head>
         <v-sidebar></v-sidebar>
         <div class="content-box" :class="{'content-collapse':collapse}">
-            <v-tags></v-tags>
+           <!-- <v-tags></v-tags> -->
             <div class="contentAll">
                 <transition name="move" mode="out-in">
                      <!-- <keep-alive :include="tagsList"> -->
                         <router-view></router-view>
                     <!-- </keep-alive> -->
-                </transition>
-                <el-backtop target=".content"></el-backtop>
+                </transition>   
             </div>
+			<!-- <el-backtop target=".content"></el-backtop> -->
         </div>
     </div>
 </template>

src/pages/purchaser/home/home.vue

@@ -30,6 +30,8 @@
 </template>
 
 <script>
+	
+import {getSearchString} from '@utils/common'
 import dataTable from '@components/dataTable.vue'
 export default {
   components: {
@@ -130,7 +132,10 @@ export default {
       ]
     }
   },
-
+  created(){
+	let token=getSearchString("token");
+	localStorage.setItem("token",token)
+  },
   methods: {
     handleSee(row) {
       this.$router.push(row.url)

src/router/index.js

@@ -7,7 +7,7 @@ export default new Router({
     routes: [
         {
             path: '/',
-            redirect: '/admin/Home'
+            redirect: '/purchaser/Home'
         },
         {
             path: '/',
@@ -783,7 +783,7 @@ export default new Router({
             ]
         }
     ],
-    mode:'hash'
+    mode:'history'
     
 });
 

src/utils/common.js

+  export function getSearchString(key) {
+      // 获取URL中?之后的字符
+     var str = location.search;
+      str = str.substring(1,str.length);
+   
+     // 以&分隔字符串，获得类似name=xiaoli这样的元素数组
+     var arr = str.split("&");
+      var obj = new Object();
+     
+   // 将每一个数组元素以=分隔并赋给obj对象    
+     for(var i = 0; i < arr.length; i++) {
+        var tmp_arr = arr[i].split("=");
+         obj[decodeURIComponent(tmp_arr[0])] = decodeURIComponent(tmp_arr[1]);
+     }
+     return obj[key];
+ }
\ No newline at end of file

src/utils/request.js

 import axios from 'axios'
-// import { Message, MessageBox } from 'element-ui'
+import { Message, MessageBox } from 'element-ui'
 // import store from '../store'
 // import { getToken,get } from '@/utils/auth'
 
 // 创建axios实例
 const service = axios.create({
-  baseURL: 'http://192.168.200.201:8082/apis', // api的base_url
+  baseURL: 'http://192.168.3.35:8085/apis', // api的base_url
   timeout: 35000 // 请求超时时间
 })
 
 // request拦截器
-// service.interceptors.request.use(config => {
-//   if (store.getters.token) {
-//     let test = config.data;
-//     if(test){
-//       config.data['access_token']= getToken()
-//     }
-
-//     if (get('storeId') && 'undefined'!=get('storeId')){
-//       config.headers['storeid'] = get('storeId')
-//     }
-
-//     config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-//   }else{
-//     config.headers['client_id'] = 'app';
-//     config.headers['client_secret'] = 'app';
-//   }
-//   return config
-// }, error => {
-//   // Do something with request error
-//   console.log(error) // for debug
-//   Promise.reject(error)
-// })
+service.interceptors.request.use(config => {
+	let token=localStorage.getItem("token")
+	console.log(token)
+	if(token){
+	  config.headers['token']=token;
+	}
+	return config
+}, error => {
+  // Do something with request error
+  console.log(error) // for debug
+  Promise.reject(error)
+})
 
 // respone拦截器
 service.interceptors.response.use(
@@ -40,42 +30,20 @@ service.interceptors.response.use(
   * code为非200是抛错 可结合自己业务进行修改
   */
     const res = response
-    // if (res.code !== 200 && !res.access_token) {
-    //   console.log(res)
-    //   Message({
-    //     message: res.msg,
-    //     type: 'error',
-    //     duration: 3 * 1000
-    //   })
-
-    //   // 401:未登录;
-    //   if (res.code === 401 || res.code === 403) {
-    //     MessageBox.confirm('你已被登出，可以取消继续留在该页面，或者重新登录', '确定登出', {
-    //       confirmButtonText: '重新登录',
-    //       cancelButtonText: '取消',
-    //       type: 'warning'
-    //     }).then(() => {
-    //       store.dispatch('FedLogOut').then(() => {
-    //         location.reload()// 为了重新实例化vue-router对象 避免bug
-    //       })
-    //     })
-    //   }
-    //   return Promise.reject('error')
-    // } 
     if (res.status !== 200) {
       alert('接口错误')	
-    }	else {
+    }else {
       return res.data
     }
   },
   error => {
-    // console.log(error)
-    // Message({
-    //   message: error.message,
-    //   type: 'error',
-    //   duration: 3 * 1000
-    // })
-    // return Promise.reject(error)
+    if(error.response.status == 500){
+    	 Message.success("登陆失效,请重新登录!")
+       localStorage.removeItem('token');
+       setTimeout(function () {
+         location.href = 'http://192.168.200.201:8081/';
+       }, 2000);
+    }
   }
 )