Skip to content

Commit

Permalink
1. 优化界面显示
Browse files Browse the repository at this point in the history
2. 增加主题变量,支持单个发件箱自定义内容
  • Loading branch information
uyoufu committed Sep 2, 2021
1 parent 866e892 commit dbc58b2
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 32 deletions.
13 changes: 5 additions & 8 deletions UI/src/layout/components/Navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,17 @@
<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
<i class="el-icon-caret-bottom" />
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
<el-dropdown-menu slot="dropdown">
<router-link to="/">
<el-dropdown-item>
Home
首页
</el-dropdown-item>
</router-link>
<a target="_blank" href="https://github.com/PanJiaChen/vue-admin-template/">
<el-dropdown-item>Github</el-dropdown-item>
</a>
<a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">
<el-dropdown-item>Docs</el-dropdown-item>
<el-dropdown-item>使用说明</el-dropdown-item>
</a>
<el-dropdown-item divided @click.native="logout">
<span style="display:block;">Log Out</span>
<span style="display:block;">退出登陆</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
Expand Down Expand Up @@ -87,7 +84,7 @@ export default {
.right-menu {
float: right;
height: 100%;
line-height: 50px;
line-height: 24px;
&:focus {
outline: none;
Expand Down
44 changes: 23 additions & 21 deletions UI/src/views/email/template.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,29 @@
@change="fileSelected"
/>

<q-card
v-for="temp in data"
:key="temp._id"
flat
bordered
class="column q-pa-xs"
style="width: 400px"
>
<div class="text-overline">{{ temp.name }}</div>
<q-img class="rounded-borders" :src="temp.imageUrl" />
<div class="row justify-between q-mt-sm">
<div>创建时间:{{ temp.createDate | formatDate }}</div>
<q-btn
color="warning"
class="self-center"
size="sm"
@click="deleteTemplate(temp._id)"
>删除</q-btn
>
</div>
</q-card>
<div class="row q-gutter-sm">
<q-card
v-for="temp in data"
:key="temp._id"
flat
bordered
class="column q-pa-xs"
style="width: 400px"
>
<div class="text-overline">{{ temp.name }}</div>
<q-img class="rounded-borders" :src="temp.imageUrl" />
<div class="row justify-between q-mt-sm">
<div>创建时间:{{ temp.createDate | formatDate }}</div>
<q-btn
color="warning"
class="self-center"
size="sm"
@click="deleteTemplate(temp._id)"
>删除</q-btn
>
</div>
</q-card>
</div>

<q-dialog v-model="isShowTemplateDialog" persistent>
<q-card class="column" style="max-width: none">
Expand Down
13 changes: 10 additions & 3 deletions UI/src/views/send/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="column q-pa-lg send-container q-gutter-md">
<div class="q-pa-lg send-container q-gutter-md">
<div class="receive-box row">
<strong style="height: auto; align-self: center"> 主题:</strong>
<input type="text" class="send-input col-grow" v-model="subject" />
Expand Down Expand Up @@ -80,9 +80,9 @@
</div>
</div>

<div style="flex: 1" v-html="selectedTemplate.html"></div>
<div v-html="selectedTemplate.html"></div>

<div class="row justify-end">
<div class="row justify-end preview-row">
<q-btn
label="发送"
color="primary"
Expand Down Expand Up @@ -309,6 +309,7 @@ export default {
right: 0;
bottom: 0;
left: 0;
overflow-y: auto;
.receive-box {
border-bottom: 1px solid gray;
Expand All @@ -318,5 +319,11 @@ export default {
border: none;
outline: none;
}
.preview-row{
position: fixed;
right: 20px;
bottom: 20px;
}
}
</style>

0 comments on commit dbc58b2

Please sign in to comment.