sunlupeng 1 year ago
parent
commit
7c5c687614

+ 2 - 2
main.js

@@ -4,8 +4,8 @@ import store from './store' // store
 import plugins from './plugins' // plugins
 import './permission' // permission
 import { parseTime,handleTree,getFileType } from "@/utils/ruoyi";
-// import VConsole from "vconsole";
-// const vConsole = new VConsole();
+import VConsole from "vconsole";
+const vConsole = new VConsole();
 Vue.use(plugins)
 
 Vue.config.productionTip = false

BIN
static/images/oa/baoxiao.png


BIN
static/images/oa/caigou.png


BIN
static/images/oa/chuchai.png


BIN
static/images/oa/lingyong.png


BIN
static/images/oa/lizhi.png


BIN
static/images/oa/qingjia.png


BIN
static/images/oa/ruzhi.png


BIN
static/images/oa/tongyong.png


BIN
static/images/oa/waichu.png


BIN
static/images/oa/xuqian.png


BIN
static/images/oa/yongyin.png


BIN
static/images/oa/zhuanzheng.png


+ 12 - 7
utils/request.js

@@ -41,13 +41,17 @@ const request = config => {
         const code = res.data.code || 200
         const msg = errorCode[code] || res.data.msg || errorCode['default']
         if (code === 401) {
-          uni.reLaunch({ url: '/' })
-          // showConfirm('登录状态已过期,您可以继续留在该页面,或者重新登录?').then(res => {
-          //   if (res.confirm) {
-          //     uni.reLaunch({ url: '/' })
-          //   }
-          // })
-          reject('无效的会话,或者会话已过期,请重新登录。')
+			store.dispatch('LogOut').then(res => {
+			  uni.reLaunch({ url: '/' })
+			})
+    //       showConfirm('登录状态已过期,您可以继续留在该页面,或者重新登录?').then(res => {
+    //         if (res.confirm) {
+    //           store.dispatch('LogOut').then(res => {
+				// uni.reLaunch({ url: '/pages/login' })
+    //           })
+    //         }
+    //       })
+			reject('无效的会话,或者会话已过期,请重新登录。')
         } else if (code === 500) {
           toast(msg)
           reject('500')
@@ -73,3 +77,4 @@ const request = config => {
 }
 
 export default request
+

+ 11 - 6
utils/upload.js

@@ -38,12 +38,16 @@ const upload = config => {
           if (code === 200) {
             resolve(result)
           } else if (code == 401) {
-            uni.reLaunch({ url: '/' })
-            // showConfirm("登录状态已过期,您可以继续留在该页面,或者重新登录?").then(res => {
-            //   if (res.confirm) {
-            //     uni.reLaunch({ url: '/' })
-            //   }
-            // })
+            store.dispatch('LogOut').then(res => {
+            		  uni.reLaunch({ url: '/' })
+            		})
+            //       showConfirm('登录状态已过期,您可以继续留在该页面,或者重新登录?').then(res => {
+            //         if (res.confirm) {
+            //           store.dispatch('LogOut').then(res => {
+            			// uni.reLaunch({ url: '/pages/login' })
+            //           })
+            //         }
+            //       })
             reject('无效的会话,或者会话已过期,请重新登录。')
           } else if (code === 500) {
             toast(msg)
@@ -70,3 +74,4 @@ const upload = config => {
 }
 
 export default upload
+