diff --git a/api/index.js b/api/index.js index 18aafad..de45735 100644 --- a/api/index.js +++ b/api/index.js @@ -1,7 +1,7 @@ import {post, upload, uploads,videoApiGet} from "../utils/request"; export const submitLogin = (params) => post("/sys/login", params) // 登录 -export const getUserInfo = (params) => post("/sys/user/info", params); // 获取用户信息 +export const getUserInfo = (params) => post("/sys/user/info/app", params); // 获取用户信息 export const getHotWorkListByState = (params) => post("/app/hotworkapplication/list", params)//获取动火列表 export const getHotWorkGoEdit = (params) => post("/app/hotworkapplication/goEdit", params) //获取动火详情 export const getImgfilesListByKeyAndType = (params) => post("/app/imgfiles/listImgs", params) //获取附件表的信息 diff --git a/pages/login/login.vue b/pages/login/login.vue index ee3bec5..7607ced 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -98,22 +98,7 @@ export default { }); uni.setStorageSync('token', token); const { user } = await getUserInfo(); - const resData = { - DEPARTMENT_NAME: user.departmentName, - JOB: user.job, - JOB_LEVEL: user.jobLevel, - BASICINFO_ID: user.basicinfoId, - DEPARTMENT_ID: user.departmentId, - CORPINFO_ID: user.corpinfoId, - NAME: user.name, - PRECINCT_ID: user.precinctId, - ROLEID: user.roleId, - ROLE_NAME: user.roleName, - USERBZ: user.bz, - USERNAME: user.username, - USER_ID: user.userId, - }; - await this.$store.dispatch('setUserInfo', resData); + await this.$store.dispatch('setUserInfo', user); await this.$store.dispatch('setfilePath', ''); uni.$u.route({ url: '/pages/index/index', diff --git a/utils/request.js b/utils/request.js index 8f78a64..961c43a 100644 --- a/utils/request.js +++ b/utils/request.js @@ -1,6 +1,6 @@ // export var requestPath = 'https://skqhdg.porthebei.com:9005/qa-regulatory-gwj/'; // 后台请求地址 -export var requestPath = 'http://127.0.0.1:8092/'; +export var requestPath = 'http://127.0.0.1:8060/new_template'; let videoApiPath = 'https://arqsp.qhdsafety.com:10010'; // 视频平台后台请求地址 import store from '../store/index' @@ -75,6 +75,9 @@ function upload(url, data) { filePath: data.filePath, name: data.name || 'file', formData: data.formData || {}, + header: { + 'token': uni.getStorageSync('token') || '' + }, success: (res) => { uni.hideLoading(); if (JSON.parse(res.data).result === 'success') { @@ -112,6 +115,9 @@ function uploads(url, data) { url: requestPath + url, files: data.files, formData: data.formData || {}, + header: { + 'token': uni.getStorageSync('token') || '' + }, success: (res) => { uni.hideLoading(); if (JSON.parse(res.data).result === 'success') {