diff --git a/src/assets/icons/svg/emailLog.svg b/src/assets/icons/svg/emailLog.svg
new file mode 100644
index 0000000..5cb5987
--- /dev/null
+++ b/src/assets/icons/svg/emailLog.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/icons/svg/emailSend.svg b/src/assets/icons/svg/emailSend.svg
new file mode 100644
index 0000000..41155d3
--- /dev/null
+++ b/src/assets/icons/svg/emailSend.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/views/tool/email/emailLog.vue b/src/views/tool/email/emailLog.vue
index 5a363d7..326f182 100644
--- a/src/views/tool/email/emailLog.vue
+++ b/src/views/tool/email/emailLog.vue
@@ -230,18 +230,22 @@ function handlePreview(row) {
}
function handleSendEmail() {
router.push({
- path: '/tool/email/sendemail'
+ name: 'sendemail'
})
}
// 添加&修改 表单提交
function handleSend(row) {
const Ids = row.id != undefined ? [row.id] : ids.value
-
- sendEmail({ idArr: Ids }).then((res) => {
- getList()
- proxy.$modal.msgSuccess('发送成功')
- })
+ proxy.$modal.loading('发送中...')
+ sendEmail({ idArr: Ids })
+ .then(() => {
+ getList()
+ proxy.$modal.msgSuccess('发送成功')
+ })
+ .finally(() => {
+ proxy.$modal.closeLoading()
+ })
}
// 删除按钮操作
diff --git a/src/views/tool/email/emailTpl.vue b/src/views/tool/email/emailTpl.vue
index f3b1452..6d23fa2 100644
--- a/src/views/tool/email/emailTpl.vue
+++ b/src/views/tool/email/emailTpl.vue
@@ -21,9 +21,6 @@
{{ $t('btn.add') }}
-
- 发送邮件
-
@@ -268,8 +265,5 @@ const handleOpenPre = function (row) {
openPreview.value = true
info.value = { ...row }
}
-function handleSend() {
- proxy.$tab.openPage('/tool/email/sendEmail')
-}
handleQuery()
diff --git a/src/views/tool/email/sendEmail.vue b/src/views/tool/email/sendEmail.vue
index 0888f64..3814f75 100644
--- a/src/views/tool/email/sendEmail.vue
+++ b/src/views/tool/email/sendEmail.vue
@@ -16,20 +16,26 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -38,7 +44,7 @@
-