Commit 6cf7bb37 authored by 夏敏伟's avatar 夏敏伟

修改token登录

parent eec1433c
...@@ -8,11 +8,11 @@ function parseToken(token) { ...@@ -8,11 +8,11 @@ function parseToken(token) {
return (decodeURIComponent(escape(window.atob(base64)))); return (decodeURIComponent(escape(window.atob(base64))));
} }
export function setLoginSuccessParam() { export function setLoginSuccessParam(token) {
//登录状态 //登录状态
sessionStorage.setItem("isLogin", true); sessionStorage.setItem("isLogin", true);
//解析token //解析token
let token = getCookie(SESSION_ID); // let token = getCookie(SESSION_ID);
let user = parseToken(token); let user = parseToken(token);
sessionStorage.setItem("user", user); sessionStorage.setItem("user", user);
sessionStorage.setItem("token", token); sessionStorage.setItem("token", token);
...@@ -25,8 +25,8 @@ export function login(account, password) { ...@@ -25,8 +25,8 @@ export function login(account, password) {
account + "&password=" + btoa(password) account + "&password=" + btoa(password)
) )
.then(res => { .then(res => {
if (res == 1) { if (res) {
setLoginSuccessParam(); setLoginSuccessParam(res);
resolve("登录成功"); resolve("登录成功");
} else { } else {
reject("密码错误"); reject("密码错误");
......
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
<div class="el-upload__tip" slot="tip">只能上传jpg/png文件,且不超过500kb</div> <div class="el-upload__tip" slot="tip">只能上传jpg/png文件,且不超过500kb</div>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item style="text-align: center;">
<el-button type="default">取消</el-button>
<el-button type="success">发送</el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
</el-dialog> </el-dialog>
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<div class="ddkz-info-content"> <div class="ddkz-info-content">
<div class="info-content-left"> <div class="info-content-left">
<div class="everyDayNews" v-for="item in newsList"> <div class="everyDayNews" v-for="item in newsList">
<div class="everyDayTitle" @click="showCards(false)"> <div class="everyDayTitle">
<div class="circle-light"></div>&emsp; <div class="circle-light"></div>&emsp;
<span v-text="item.time"></span>&emsp; <span v-text="item.time"></span>&emsp;
<!-- <span v-text="item.week"></span> --> <!-- <span v-text="item.week"></span> -->
...@@ -418,10 +418,6 @@ export default { ...@@ -418,10 +418,6 @@ export default {
this.peopleList = res.chatRoomMemberRelationBOList; this.peopleList = res.chatRoomMemberRelationBOList;
}); });
// //查询我方聊天记录
// getRecordsByPaging(item.id, 1, 100, '2020-01-01 00:00:00', '2023-10-01 00:00:00', null, item.teamId).then(res1 => {
// this.chatMessageList = res1.records;
// })
//分页查询群聊天记录 //分页查询群聊天记录
getRecordsByPaging(item.id, 1, 100, '2020-01-01 00:00:00', '2023-10-01 00:00:00').then(res1 => { getRecordsByPaging(item.id, 1, 100, '2020-01-01 00:00:00', '2023-10-01 00:00:00').then(res1 => {
let newsArr = []; let newsArr = [];
...@@ -516,7 +512,7 @@ export default { ...@@ -516,7 +512,7 @@ export default {
height: 100%; height: 100%;
.ddkz-selection { .ddkz-selection {
display: none; // display: none;
width: 100%; width: 100%;
height: 40px; height: 40px;
text-align: right; text-align: right;
...@@ -684,7 +680,7 @@ export default { ...@@ -684,7 +680,7 @@ export default {
height: 100%; height: 100%;
.ddkz-info-selection { .ddkz-info-selection {
display: none; // display: none;
width: 100%; width: 100%;
height: 40px; height: 40px;
text-align: right; text-align: right;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment