zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into dev-tw

Browse Source
This commit is contained in:
tangwei 2026-04-24 08:33:40 +08:00
commit 2d654c9694
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/views/login/index.vue
View File

@ -159,7 +159,7 @@
>
<span>登录</span>
</a-button>
<a-button
<!-- <a-button
type="link"
size="mini"
block
@ -167,14 +167,14 @@
:style="{ marginTop: '10px', border: 'none' }"
>
忘记密码
</a-button>
</a-button> -->
<!-- 忘记密码 -->
</a-form>
</a-tab-pane>
<!-- 短信登录 Tab (占位) -->
<a-tab-pane key="sms" tab="短信登录">
<!-- <a-tab-pane key="sms" tab="短信登录">
<a-form
:model="loginData"
:rules="loginRules"
@ -231,7 +231,7 @@
<span>登录</span>
</a-button>
</a-form>
</a-tab-pane>
</a-tab-pane> -->
</a-tabs>
</div>
</div>

4
frontend/src/views/system/user/index.vue
View File

@ -923,7 +923,7 @@ function handleClearSelection() {
:header-cell-style="{ background: 'rgb(250 250 250)', color: ' #383838', height: '50px' }">
<el-table-column type="selection" width="50" align="center" />
<el-table-column type="index" label="序号" width="70" align="center" />
<el-table-column prop="nickname" label="用户姓名" width="100"></el-table-column>
<el-table-column prop="nickname" label="用户姓名" width="140"></el-table-column>
<!-- <el-table-column prop="avatar" label="头像"></el-table-column> -->
<el-table-column prop="email" label="邮箱"></el-table-column>
<el-table-column prop="phone" label="手机号" min-width="90"></el-table-column>
@ -948,7 +948,7 @@ function handleClearSelection() {
{{ dateFormat(scope.row.lastmodifydate) }}
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="110">
<el-table-column fixed="right" label="操作" width="130">
<template #default="scope">
<span
style="display: flex;display: -webkit-flex;justify-content: space-around;-webkit-justify-content: space-around; ">