347617796@qq.com пре 3 година
родитељ
комит
db2a6b86c6
8 измењених фајлова са 6 додато и 84 уклоњено
  1. 0 5
      build/webpack.dev.conf.js
  2. 0 6
      src/api/auth.js
  3. 0 9
      src/errorLog.js
  4. 4 10
      src/main.js
  5. 1 1
      src/permission.js
  6. 0 11
      src/utils/request-user.js
  7. 0 40
      src/utils/request.js
  8. 1 2
      src/utils/wxconfiguration.js

+ 0 - 5
build/webpack.dev.conf.js

@@ -15,11 +15,6 @@ function resolve(dir) {
 const HOST = process.env.HOST
 const PORT = process.env.PORT && Number(process.env.PORT)
 
-
-
-
-
-
 const devWebpackConfig = merge(baseWebpackConfig, {
   mode: 'development',
   module: {

+ 0 - 6
src/api/auth.js

@@ -7,16 +7,10 @@ export function getIsCreator (key) {
 	 let is=false;
 	 let getUserdatas = getUserData()
 	 for(let i in getUserdatas){
-		//  console.log(getUserdatas[i])
 		 if(key == getUserdatas[i].name){
 			is=true;
 		 }
 	 }
-	//  getUserData().forEach(item=>{ 
-	// 	 if(key==item.name){
-	// 		 is=true;
-	// 	 }
-	//  })
 	 return is
 }
 export function supremeAuthority () {

+ 0 - 9
src/errorLog.js

@@ -1,9 +0,0 @@
-import Vue from 'vue'
-import store from './store'
-
-Vue.config.errorHandler = function(err, vm, info, a) {
-  Vue.nextTick(() => {
-    store.dispatch('addErrorLog', { err, vm,info, url: window.location.href})
-    console.error(err, info)
-  })
-}

+ 4 - 10
src/main.js

@@ -4,7 +4,6 @@ import Element from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import moment from 'moment' // 时间库
 import '@/styles/index.scss' // global css
-// import {axios} from '@/utils/request'
 import request from '@/utils/request'
 import axios_user from '@/utils/request-user'
 import App from './App'
@@ -15,16 +14,12 @@ import {supremeAuthority,authoritys} from './api/auth';
 
 import i18n from './lang' // Internationalization
 import './icons' // icon
-// import './errorLog' // error log
 import './permission' // permission control
 import * as filters from '@/utils/filters' // global filters
 import jtoken from '@/utils/jtoken'
 
-
-
-// import wx from 'weixin-js-sdk';
-import VConsole from 'vconsole'
-new VConsole()
+// import VConsole from 'vconsole'
+// new VConsole()
 
 // 头像
 import userImage from '@/components/user_image'
@@ -40,7 +35,7 @@ Vue.use(Element, {
   size: 'medium',
   i18n: (key, value) => i18n.t(key, value)
 })
-// Vue.prototype.$http = axios
+
 Vue.prototype.$getToken = getToken()
 Vue.prototype.$http = request
 Vue.prototype.$http_user = axios_user
@@ -50,10 +45,9 @@ Vue.prototype.serveAd = process.env.SERVE_AD
 Vue.prototype.serverdomain = process.env.BASE_API
 Vue.prototype.$supremeAuthority = supremeAuthority
 Vue.prototype.$authoritys = authoritys
-// Vue.prototype.$wx = wx;
+Vue.prototype.$wx = (window).wx; // 全局使用
 
 
-Vue.prototype.$wx = (window).wx; // 全局使用
 
 Object.keys(filters).forEach(key => {
   Vue.filter(key, filters[key])

+ 1 - 1
src/permission.js

@@ -93,6 +93,6 @@ router.beforeEach((to, from, next) => {
 })
 
 router.afterEach((to, from) => {
-  console.log(to)
+  // console.log(to)
   // NProgress.done() // finish progress bar
 })

+ 0 - 11
src/utils/request-user.js

@@ -4,7 +4,6 @@ import { removeToken } from '@/utils/auth'
 import store from '@/store'
 import qs from 'qs'
 import Vue from 'vue'
-// import moment from 'moment' // 时间库
 const service = axios.create({
   baseURL: process.env.BASE_API, // api的base_url  https://intesys.cms.g107.com
   timeout: 10000,
@@ -16,7 +15,6 @@ const service = axios.create({
     return qs.stringify(data)
   }]
 })
-// request interceptor
 service.interceptors.request.use(
   config => {
     if (localStorage.getItem('user_token_temp')) {
@@ -29,7 +27,6 @@ service.interceptors.request.use(
   }
 )
 var bool = true// 五秒执行一次变量
-// respone interceptor
 service.interceptors.response.use(
   response => {
     const res = response.data
@@ -73,7 +70,6 @@ service.interceptors.response.use(
       })
       return Promise.reject('error')
     } else if(res.code === 4444){
-      // console.log(store.state)
       store.state.user.pastDue = true
       localStorage.clear()
       sessionStorage.clear()
@@ -83,13 +79,6 @@ service.interceptors.response.use(
       })
       return Promise.reject('error')
     } else {
-      // console.log('user_token_temp')
-      // console.log(res.refresh_token)
-      // if(res.refresh_token && res.code == 1){
-      //   console.log('平台Token'+moment().format('YYYY-MM-DD  HH:mm:ss'))
-      //   console.log(res.refresh_token)
-      //   localStorage.setItem('user_token_temp', res.refresh_token)
-      // }
       return response
     }
   },

+ 0 - 40
src/utils/request.js

@@ -5,7 +5,6 @@ import Router from'@/router'
 import {getToken, removeAllToken, setToken} from '@/utils/auth'
 import qs from 'qs'
 import Vue from 'vue'
-// import moment from 'moment' // 时间库
 const service = axios.create({
   baseURL: process.env.BASE_API, // api的base_url  https://intesys.cms.g107.com
   timeout: 10000,
@@ -21,12 +20,6 @@ service.interceptors.request.use(
     if (store.getters.token) {
       config.headers['A-TOKEN'] = getToken()
     }
-    // if (config.url == '/api/integral/statistics/ranking') {
-    //   config.headers['Accept'] = 'application/vnd.test.v2+json'
-    // }
-    // if (config.url == '/api/integral/performance/employee') {
-    //   config.headers['Accept'] = 'application/vnd.test.v3+json'
-    // }
     return config
   },
   error => {
@@ -38,28 +31,6 @@ var bool = true// 五秒执行一次变量
 service.interceptors.response.use(
   response => {
     const res = response.data
-    // if (response.data.code === 1) {
-    //   if (response.data.refresh_token) {
-    //     if (response.data.refresh_token !== getToken()) {
-    //       localStorage.setItem('Admin-Token', response.data.refresh_token)
-    //     }
-    //   }
-    //   var timestamp = parseInt((new Date()).valueOf() / 1000)
-    //   if (window.plus) {
-    //       var temp_timestamp = plus.storage.getItem('token-expire')
-    //       if (temp_timestamp < timestamp && response.data.refresh_token) {
-    //         setToken(response.data.refresh_token)
-    //         plus.storage.setItem('token-expire', timestamp + 7200)
-    //       }
-    //   } else {
-    //     var temp_timestamp = localStorage.getItem('token-expire')
-    //     if (temp_timestamp < timestamp && response.data.refresh_token) {
-    //       setToken(response.data.refresh_token)
-    //       localStorage.setItem('token-expire', timestamp + 7200)
-    //     }
-    //   }
-    //   return response
-    // }else 
     if (res.code === 401) {
       // 50008:非法的token; 50012:其他客户端登录了;  401:Token 过期了; 2000 考勤系统的token过期
       MessageBox.confirm('当前登录授权时间已经过期,请重新授权登录', '确定登出', {
@@ -103,12 +74,10 @@ service.interceptors.response.use(
       return Promise.reject('error')
     } else if (res.code === 3000) {
       Message({
-        // message: '服务暂时不可用,请稍后重试,或联系客服',
         message: res.msg
       })
       return Promise.reject('error')
     }  else if(res.code === 4444){
-        // console.log(store.state)
         store.state.user.pastDue = true
         localStorage.clear()
         sessionStorage.clear()
@@ -118,13 +87,6 @@ service.interceptors.response.use(
         })
         return Promise.reject('error')
     } else {
-      // console.log('setToken')
-      // console.log(res.refresh_token)
-      // if(res.refresh_token && res.code == 1){
-      //   console.log('公司Token'+moment().format('YYYY-MM-DD  HH:mm:ss'))
-      //   console.log(res.refresh_token)
-      //   setToken(res.refresh_token);
-      // }
       return response
     }
   },
@@ -149,7 +111,6 @@ service.interceptors.response.use(
     return Promise.reject(error)
   }
 )
-// export default service
 
 // 接口再次封装
 var CancelToken = axios.CancelToken; //中断请求
@@ -194,7 +155,6 @@ export default (type, url, data,versions,Content_Type,transform) => {
 		        })
 		    }
         var json = (type == 'get') ? Object.assign(aa, { params: data },transformRequest) : Object.assign(aa, { data: data },transformRequest);
-        // console.log(json)
 		    var ajax = service(json).then(res => {
 		        resolve(res);
 		    }).catch(error => {   //中断请求和请求出错的处理

+ 1 - 2
src/utils/wxconfiguration.js

@@ -1,4 +1,4 @@
-// import moment from 'moment' // 时间库
+
 export function withoutCodeLoad() {
   console.log(process.env.APPID)
   let appid, redirect_uri, response_type, scope, state, wechat, agentid
@@ -10,5 +10,4 @@ export function withoutCodeLoad() {
   wechat = '#wechat_redirect'
   let link = 'appid=' + appid + '&redirect_uri=' + redirect_uri + '&response_type=' + response_type + '&scope=' + scope + '&state=' + state + wechat
   window.location.href = 'https://open.weixin.qq.com/connect/oauth2/authorize?' + link
-  // +moment().format('X')
 }