Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

src/api/common.js

@@ -57,7 +57,12 @@ export function previewFile(id, responseType = 'arraybuffer') {
 			responseType,
 			success(result) {  
 				console.log(result)
+				// #ifdef APP-PLUS
+				let _header = result.header['Content-Type'].split(';')[0]
+				// #endif
+				// #ifndef APP-PLUS
 				let _header = result.header['content-type'].split(';')[0]
+				// #endif
 				// let base64 = new Blob([result.data],{type:result.header['content-type'].split(';')[0]})
 				let base64 = `data:${_header};base64,` + uni.arrayBufferToBase64(result.data)
 				resolve(base64)

src/api/login.js

@@ -1,8 +1,7 @@
 import request from '@/api/request'
 import common from "@/common/common";
+import {setToken, setUserInfo} from "@/common/common";
 
-const setToken = data => uni.setStorageSync('token', data)
-const setUserInfo = data => uni.setStorageSync('userInfo', data)
 
 // 账号登录接口
 export const useAccountLoginApp = (data) => request({
@@ -63,4 +62,7 @@ export const loginOut = (data) => request({
   url: '/traapp/access/loginOut',
   method: 'post',
   data
+}).then(() =>{
+	setToken(null)
+	setUserInfo(null)
 })