From dbc58b2fb593b777b42b5aa9d28825c2a8346faf Mon Sep 17 00:00:00 2001
From: galensgan <gmx_galens@163.com>
Date: Thu, 2 Sep 2021 22:57:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=202.=20=E5=A2=9E=E5=8A=A0=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=EF=BC=8C=E6=94=AF=E6=8C=81=E5=8D=95=E4=B8=AA?=
 =?UTF-8?q?=E5=8F=91=E4=BB=B6=E7=AE=B1=E8=87=AA=E5=AE=9A=E4=B9=89=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UI/src/layout/components/Navbar.vue | 13 ++++-----
 UI/src/views/email/template.vue     | 44 +++++++++++++++--------------
 UI/src/views/send/index.vue         | 13 +++++++--
 3 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/UI/src/layout/components/Navbar.vue b/UI/src/layout/components/Navbar.vue
index 0ca5cf6a..d60edc53 100644
--- a/UI/src/layout/components/Navbar.vue
+++ b/UI/src/layout/components/Navbar.vue
@@ -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>
@@ -87,7 +84,7 @@ export default {
   .right-menu {
     float: right;
     height: 100%;
-    line-height: 50px;
+    line-height: 24px;
 
     &:focus {
       outline: none;
diff --git a/UI/src/views/email/template.vue b/UI/src/views/email/template.vue
index 1492adb2..9e96b81f 100644
--- a/UI/src/views/email/template.vue
+++ b/UI/src/views/email/template.vue
@@ -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">
diff --git a/UI/src/views/send/index.vue b/UI/src/views/send/index.vue
index 5ce9b872..30046c25 100644
--- a/UI/src/views/send/index.vue
+++ b/UI/src/views/send/index.vue
@@ -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" />
@@ -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"
@@ -309,6 +309,7 @@ export default {
   right: 0;
   bottom: 0;
   left: 0;
+  overflow-y: auto;
 
   .receive-box {
     border-bottom: 1px solid gray;
@@ -318,5 +319,11 @@ export default {
     border: none;
     outline: none;
   }
+
+  .preview-row{
+    position: fixed;
+    right: 20px;
+    bottom: 20px;
+  }
 }
 </style>
\ No newline at end of file