From b7eedb41516a6ab02526e64177331a9669f4d3cb Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 15:54:23 +0800
Subject: [PATCH] 修改冲突
---
src/view/enter.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/view/enter.vue b/src/view/enter.vue
index 169cd69..1bd979e 100644
--- a/src/view/enter.vue
+++ b/src/view/enter.vue
@@ -97,7 +97,7 @@
<template>
<div class="enter">
<div class="left">
- <img src="../../static/img/鐗归珮鍘�.png">
+ <img src="../../static/img/鐗归珮鍘�.jpg">
</div>
<div class="right">
<div style="width: calc(100% - 100px * 2);">
@@ -111,7 +111,7 @@
<el-input v-model="ruleForm.pwd" placeholder="璇疯緭鍏ュ瘑鐮�" clearable show-password @keyup.enter.native="submitForm('ruleForm')"></el-input>
</el-form-item>
<el-form-item style="margin-bottom: 8px;">
- <el-col :span="12"><el-checkbox v-model="ruleForm.remumberme">璁颁綇瀵嗙爜</el-checkbox></el-col>
+ <el-col :span="12" style="text-align: left;"><el-checkbox v-model="ruleForm.remumberme">璁颁綇瀵嗙爜</el-checkbox></el-col>
<el-col :span="12" style="text-align: right;"><el-checkbox
v-model="ruleForm.autoenter">鑷姩鐧诲綍</el-checkbox></el-col>
</el-form-item>
@@ -183,7 +183,8 @@
localStorage.setItem('user', JSON.stringify({
account: this.ruleForm.account,
password: this.ruleForm.pwd,
- name: res.data.name
+ name: res.data.name,
+ userId: res.data.userId
}))
sessionStorage.setItem('token', res.data.token)
sessionStorage.setItem('reToken', res.data.reToken)
--
Gitblit v1.9.3