Browse Source

feat(utils/request): 添加状态校验
refactor(utils/upload): 修改错误代码

wangpx 1 year ago
parent
commit
6860ab064c
3 changed files with 15 additions and 20 deletions
  1. 2 4
      api/work.js
  2. 10 13
      utils/request.js
  3. 3 3
      utils/upload.js

+ 2 - 4
api/work.js

@@ -59,8 +59,6 @@ export function getProcessForm(user, process) {
 
 // 提交流程 表单
 export function submitProcessForm(user, process, fileIds) {
-	console.log('user==[]', user);
-	console.log('process==[]', process);
 	return request({
 		url: preUrl,
 		method: 'post',
@@ -89,10 +87,10 @@ export function submitProcessForm(user, process, fileIds) {
 	})
 }
 
-export function uploadFiles(data) {
+export function uploadFile(data) {
 	return upload({
     url: '/MiniAppUploadFileAction.do',
     name: data.name,
-    files: data.files
+    filePath: data.filePath
   })
 }

+ 10 - 13
utils/request.js

@@ -9,22 +9,19 @@ const baseUrl = config.baseUrl
 
 const request = config => {
   // 是否需要设置 token
-  const isSession = config.isSession === false
+  const isSession = config.isSession || false
   config.header = config.header || {}
   if (isSession) {
-	if (getSession()) {
-		config.header['cookie'] = getSession()
-	} else {
-		showConfirm('登录状态已过期,您可以继续留在该页面,或者重新登录?').then(res => {
-		  // if (res.confirm) {
-		  // store.dispatch('LogOut').then(res => {
-		  //   uni.reLaunch({ url: '/pages/login' })
-		  // })
-		  // }
-		})
-		reject('无效的会话,或者会话已过期,请重新登录。')
+		if (getSession()) {
+			config.header['cookie'] = getSession()
+			} else {
+			  showConfirm('登录状态已过期,您可以继续留在该页面,或者重新登录?').then(() => {
+				  uni.reLaunch({ url: '/pages/login' })
+				})
+				}
+			reject('无效的会话,或者会话已过期,请重新登录。')
+		}
 	}
-  }
   // get请求映射params参数
   if (config.params) {
     let url = config.url + '?' + tansParams(config.params)

+ 3 - 3
utils/upload.js

@@ -26,7 +26,7 @@ const upload = config => {
       timeout: config.timeout || timeout,
       url: baseUrl + config.url,
       // files: config.files,
-      filePath: config.files,
+      filePath: config.filePath,
       name: config.name || 'file',
       header: config.header,
       formData: config.formData,
@@ -36,8 +36,8 @@ const upload = config => {
 				try {
 					const result = JSON.parse(data)
 				} catch (e) {
-          toast('上传失败 请重试')
-          reject(-201)
+          toast('上传失败, 请重试')
+          reject(-20201)
           return
 				}
         const result = JSON.parse(data)