Merge branch 'vue3' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui into vue3

2026-08-07 03:15:01 +08:00 · 2026-07-13 14:32:20 +08:00
parent e67ea56651 ecf11ae2d2
commit 0002a39fc4
151 changed files with 1618 additions and 1800 deletions
--- a/manager/src/views/sys/app-version/appVersion.vue
+++ b/manager/src/views/sys/app-version/appVersion.vue
@@ -164,6 +164,8 @@
 </template>

 <script>
+import { ElMessage, ElMessageBox } from "element-plus";
+import { unixToDate } from "@/utils/filters";
 import * as API_Setting from "@/api/setting";

 export default {
@@ -233,7 +235,7 @@ export default {
      this.modalVisible = true;
      this.modalTitle = "添加APP版本信息";
      this.modalType = 0;
-      const versionUpdateDate = this.$filters.unixToDate(new Date() / 1000);
+      const versionUpdateDate = unixToDate(new Date() / 1000);
      this.form = {
        forceUpdate: 0,
        type: "IOS",
@@ -253,7 +255,7 @@ export default {
        if (valid) {
          this.submitLoading = true;
          if (JSON.stringify(this.form.versionUpdateDate).includes("T")) {
-            const versionUpdateDate = this.$filters.unixToDate(
+            const versionUpdateDate = unixToDate(
              this.form.versionUpdateDate / 1000
            );
            this.form.versionUpdateDate = versionUpdateDate;
@@ -264,7 +266,7 @@ export default {
            API_Setting.addVersion(this.form).then((res) => {
              this.submitLoading = false;
              if (res && res.success) {
-                this.$Message.success("添加成功");
+                ElMessage.success("添加成功");
                this.modalVisible = false;
                this.getData();
              }
@@ -273,7 +275,7 @@ export default {
            API_Setting.editVersion(this.form, this.form.id).then((res) => {
              this.submitLoading = false;
              if (res && res.success) {
-                this.$Message.success("修改成功");
+                ElMessage.success("修改成功");
                this.modalVisible = false;
                this.getData();
              }
@@ -283,20 +285,14 @@ export default {
      });
    },
    remove(v) {
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除么?",
-        loading: true,
-        onOk: () => {
+      ElMessageBox.confirm("您确认要删除么?", "确认删除", { type: "warning" }).then(() => {
          API_Setting.deleteVersion(v.id).then((res) => {
-            this.$Modal.remove();
            if (res.success) {
-              this.$Message.success("删除成功");
+              ElMessage.success("删除成功");
              this.getData();
            }
          });
-        },
-      });
+      }).catch(() => {});
    },
    detail(v) {
      this.queryModalVisible = true;
--- a/manager/src/views/sys/department-manage/departmentManage.vue
+++ b/manager/src/views/sys/department-manage/departmentManage.vue
@@ -106,6 +106,7 @@
 </template>

 <script>
+import { ElMessage, ElMessageBox } from "element-plus";
 import {
  initDepartment,
  addDepartment,
@@ -275,7 +276,7 @@ export default {
      this.$refs.form.validate((valid) => {
        if (valid) {
          if (!this.form.id) {
-            this.$Message.warning("请先点击选择要修改的部门");
+            ElMessage.warning("请先点击选择要修改的部门");
            return;
          }
          const roleWay = [];
@@ -292,7 +293,7 @@ export default {
          ]).then((res) => {
            this.submitLoading = false;
            if (res[0].success) {
-              this.$Message.success("编辑成功");
+              ElMessage.success("编辑成功");
              this.init();
              this.modalVisible = false;
            }
@@ -307,7 +308,7 @@ export default {
          addDepartment(this.formAdd).then((res) => {
            this.submitLoading = false;
            if (res.success) {
-              this.$Message.success("添加成功");
+              ElMessage.success("添加成功");
              this.init();
              this.modalVisible = false;
            }
@@ -317,7 +318,7 @@ export default {
    },
    add() {
      if (this.form.id == "" || this.form.id == null) {
-        this.$Message.warning("请先点击选择一个部门");
+        ElMessage.warning("请先点击选择一个部门");
        return;
      }
      this.modalTitle = "添加子部门";
@@ -341,32 +342,25 @@ export default {
    },
    delAll() {
      if (this.selectCount <= 0) {
-        this.$Message.warning("您还未勾选要删除的数据");
+        ElMessage.warning("您还未勾选要删除的数据");
        return;
      }
-      this.$Modal.confirm({
-        title: "确认删除",
-        content:
-          "您确认要删除所选的 " + this.selectCount + " 条数据及其下级所有数据?",
-        loading: true,
-        onOk: () => {
+      ElMessageBox.confirm("您确认要删除所选的 " + this.selectCount + " 条数据及其下级所有数据?", "确认删除", { type: "warning" }).then(() => {
          let ids = "";
          this.selectList.forEach(function (e) {
            ids += e.id + ",";
          });
          ids = ids.substring(0, ids.length - 1);
          deleteDepartment(ids).then((res) => {
-            this.$Modal.remove();
            if (res.success) {
-              this.$Message.success("删除成功");
+              ElMessage.success("删除成功");
              this.selectList = [];
              this.selectCount = 0;
              this.cancelSelect();
              this.init();
            }
          });
-        },
-      });
+      }).catch(() => {});
    },
  },
  mounted() {
--- a/manager/src/views/sys/log-manage/logManage.vue
+++ b/manager/src/views/sys/log-manage/logManage.vue
@@ -45,7 +45,7 @@
        <el-table-column prop="costTime" label="耗时-毫秒" width="140" align="center" />
        <el-table-column label="操作时间" width="170" align="center">
          <template #default="{ row }">
-            <span v-if="row">{{ $filters.unixToDate(row.createTime / 1000) }}</span>
+            <span v-if="row">{{ unixToDate(row.createTime / 1000) }}</span>
          </template>
        </el-table-column>
      </el-table>
@@ -67,6 +67,8 @@
 </template>

 <script>
+import { ElMessage } from "element-plus";
+import { unixToDate } from "@/utils/filters";
 import { getLogListData } from "@/api/index";

 export default {
@@ -91,6 +93,7 @@ export default {
    };
  },
  methods: {
+    unixToDate,
    init() {
      this.getLogList();
    },
@@ -130,7 +133,7 @@ export default {
        } else {
          this.data = [];
          this.total = 0;
-          this.$Message.error((res && res.message) || "日志查询失败");
+          ElMessage.error((res && res.message) || "日志查询失败");
        }
      });
    },
--- a/manager/src/views/sys/menu-manage/menu.vue
+++ b/manager/src/views/sys/menu-manage/menu.vue
@@ -187,6 +187,7 @@
 </template>

 <script>
+import { ElMessage, ElMessageBox } from "element-plus";
 import { Menu, List, ArrowDown } from "@element-plus/icons-vue";
 import {
  getAllPermissionList,
@@ -420,7 +421,7 @@ export default {
      this.$refs.form.validate((valid) => {
        if (valid) {
          if (!this.form.id) {
-            this.$Message.warning("请先点击选择要修改的菜单节点");
+            ElMessage.warning("请先点击选择要修改的菜单节点");
            return;
          }
          this.submitLoading = true;
@@ -438,7 +439,7 @@ export default {
          editPermission(this.form).then((res) => {
            this.submitLoading = false;
            if (res.success) {
-              this.$Message.success("编辑成功");
+              ElMessage.success("编辑成功");
              this.$store.commit("setAdded", false);
              util.initRouter(this);
              this.init();
@@ -456,7 +457,7 @@ export default {
          addPermission(this.formAdd).then((res) => {
            this.submitLoading = false;
            if (res.success) {
-              this.$Message.success("添加成功");
+              ElMessage.success("添加成功");
              this.$store.commit("setAdded", false);
              util.initRouter(this);
              this.init();
@@ -468,17 +469,14 @@ export default {
    },
    addMenu() {
      if (!this.form.id) {
-        this.$Message.warning("请先点击选择一个菜单权限节点");
+        ElMessage.warning("请先点击选择一个菜单权限节点");
        return;
      }
      this.parentTitle = this.form.title;
      this.modalTitle = "添加子节点";
      this.showParent = true;
      if (this.form.level == 2) {
-        this.$Modal.warning({
-          title: "抱歉，不能添加啦",
-          content: "仅支持2级菜单目录",
-        });
+        ElMessageBox.alert("仅支持2级菜单目录", "抱歉，不能添加啦", { type: "warning" });
        return;
      }
      this.formAdd = {
@@ -504,23 +502,18 @@ export default {
    },
    delAll() {
      if (this.selectCount <= 0) {
-        this.$Message.warning("您还未勾选要删除的数据");
+        ElMessage.warning("您还未勾选要删除的数据");
        return;
      }
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
-        loading: true,
-        onOk: () => {
+      ElMessageBox.confirm("您确认要删除所选的 " + this.selectCount + " 条数据?", "确认删除", { type: "warning" }).then(() => {
          let ids = "";
          this.selectList.forEach(function (e) {
            ids += e.id + ",";
          });
          ids = ids.substring(0, ids.length - 1);
          deletePermission(ids).then((res) => {
-            this.$Modal.remove();
            if (res.success) {
-              this.$Message.success("删除成功");
+              ElMessage.success("删除成功");
              this.$store.commit("setAdded", false);
              util.initRouter(this);
              this.selectList = [];
@@ -529,8 +522,7 @@ export default {
              this.init();
            }
          });
-        },
-      });
+      }).catch(() => {});
    },
  },
  mounted() {
--- a/manager/src/views/sys/menu-manage/storeMenu.vue
+++ b/manager/src/views/sys/menu-manage/storeMenu.vue
@@ -187,6 +187,7 @@
 </template>

 <script>
+import { ElMessage, ElMessageBox } from "element-plus";
 import { Menu, List, ArrowDown } from "@element-plus/icons-vue";
 import {
  getStoreAllPermissionList,
@@ -420,7 +421,7 @@ export default {
      this.$refs.form.validate((valid) => {
        if (valid) {
          if (!this.form.id) {
-            this.$Message.warning("请先点击选择要修改的菜单节点");
+            ElMessage.warning("请先点击选择要修改的菜单节点");
            return;
          }
          this.submitLoading = true;
@@ -438,7 +439,7 @@ export default {
          editStorePermission(this.form).then((res) => {
            this.submitLoading = false;
            if (res.success) {
-              this.$Message.success("编辑成功");
+              ElMessage.success("编辑成功");
              this.$store.commit("setAdded", false);
              util.initRouter(this);
              this.init();
@@ -456,7 +457,7 @@ export default {
          addStorePermission(this.formAdd).then((res) => {
            this.submitLoading = false;
            if (res.success) {
-              this.$Message.success("添加成功");
+              ElMessage.success("添加成功");
              this.$store.commit("setAdded", false);
              util.initRouter(this);
              this.init();
@@ -468,17 +469,14 @@ export default {
    },
    addMenu() {
      if (!this.form.id) {
-        this.$Message.warning("请先点击选择一个菜单权限节点");
+        ElMessage.warning("请先点击选择一个菜单权限节点");
        return;
      }
      this.parentTitle = this.form.title;
      this.modalTitle = "添加子节点";
      this.showParent = true;
      if (this.form.level == 2) {
-        this.$Modal.warning({
-          title: "抱歉，不能添加啦",
-          content: "仅支持2级菜单目录",
-        });
+        ElMessageBox.alert("仅支持2级菜单目录", "抱歉，不能添加啦", { type: "warning" });
        return;
      }
      this.formAdd = {
@@ -504,23 +502,18 @@ export default {
    },
    delAll() {
      if (this.selectCount <= 0) {
-        this.$Message.warning("您还未勾选要删除的数据");
+        ElMessage.warning("您还未勾选要删除的数据");
        return;
      }
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
-        loading: true,
-        onOk: () => {
+      ElMessageBox.confirm("您确认要删除所选的 " + this.selectCount + " 条数据?", "确认删除", { type: "warning" }).then(() => {
          let ids = "";
          this.selectList.forEach(function (e) {
            ids += e.id + ",";
          });
          ids = ids.substring(0, ids.length - 1);
          deleteStorePermission(ids).then((res) => {
-            this.$Modal.remove();
            if (res.success) {
-              this.$Message.success("删除成功");
+              ElMessage.success("删除成功");
              this.$store.commit("setAdded", false);
              util.initRouter(this);
              this.selectList = [];
@@ -529,8 +522,7 @@ export default {
              this.init();
            }
          });
-        },
-      });
+      }).catch(() => {});
    },
  },
  mounted() {
--- a/manager/src/views/sys/message/messageTemplate.vue
+++ b/manager/src/views/sys/message/messageTemplate.vue
@@ -219,6 +219,7 @@
 </template>

 <script>
+import { ElMessage } from "element-plus";
 import * as API_Setting from "@/api/setting.js";

 export default {
@@ -290,7 +291,7 @@ export default {
        if (!(res && res.success && res.result)) {
          this.memberRows = [];
          this.total = 0;
-          this.$Message.error((res && res.message) || "加载消息模板失败");
+          ElMessage.error((res && res.message) || "加载消息模板失败");
          return;
        }
        const records = res.result.records || [];
@@ -332,9 +333,9 @@ export default {
        const res = await API_Setting.wechatMessageSync();
        if (res && res.success) {
          await this.loadMemberPage();
-          this.$Message.success("服务号模板同步成功");
+          ElMessage.success("服务号模板同步成功");
        } else {
-          this.$Message.error((res && res.message) || "服务号模板同步失败");
+          ElMessage.error((res && res.message) || "服务号模板同步失败");
        }
      } finally {
        this.syncOaLoading = false;
@@ -346,9 +347,9 @@ export default {
        const res = await API_Setting.wechatMPMessageSync();
        if (res && res.success) {
          await this.loadMemberPage();
-          this.$Message.success("小程序模板同步成功");
+          ElMessage.success("小程序模板同步成功");
        } else {
-          this.$Message.error((res && res.message) || "小程序模板同步失败");
+          ElMessage.error((res && res.message) || "小程序模板同步失败");
        }
      } finally {
        this.syncMpLoading = false;
@@ -402,9 +403,9 @@ export default {
      const res = await API_Setting.updateMessageStatus(row.id, this.toOpenClose(v));
      if (!(res && res.success)) {
        this.updateRowStatus(row, "noticeStatus", old);
-        this.$Message.error((res && res.message) || "站内信开关更新失败");
+        ElMessage.error((res && res.message) || "站内信开关更新失败");
      } else {
-        this.$Message.success("站内信开关更新成功");
+        ElMessage.success("站内信开关更新成功");
      }
    },
    async toggleOaChannel(v, row) {
@@ -416,13 +417,13 @@ export default {
        const res = await API_Setting.editWechatMessageTemplate(row.oaId, params);
        if (!(res && res.success)) {
          this.updateRowStatus(row, "oaStatus", old);
-          this.$Message.error((res && res.message) || "服务号开关更新失败");
+          ElMessage.error((res && res.message) || "服务号开关更新失败");
        } else {
-          this.$Message.success("服务号开关更新成功");
+          ElMessage.success("服务号开关更新成功");
        }
      } catch (e) {
        this.updateRowStatus(row, "oaStatus", old);
-        this.$Message.error((e && e.message) || "服务号开关更新失败");
+        ElMessage.error((e && e.message) || "服务号开关更新失败");
      }
    },
    async toggleMpChannel(v, row) {
@@ -433,9 +434,9 @@ export default {
      const res = await API_Setting.editWechatMPMessageTemplate(row.mpId, params);
      if (!(res && res.success)) {
        this.updateRowStatus(row, "mpStatus", old);
-        this.$Message.error((res && res.message) || "小程序开关更新失败");
+        ElMessage.error((res && res.message) || "小程序开关更新失败");
      } else {
-        this.$Message.success("小程序开关更新成功");
+        ElMessage.success("小程序开关更新成功");
      }
    },
    async toggleEmailChannel(v, row) {
@@ -444,9 +445,9 @@ export default {
      const res = await API_Setting.updateNoticeMessageEmailStatus(row.id, this.toOpenClose(v));
      if (!(res && res.success)) {
        this.updateRowStatus(row, "emailStatus", old);
-        this.$Message.error((res && res.message) || "邮箱开关更新失败");
+        ElMessage.error((res && res.message) || "邮箱开关更新失败");
      } else {
-        this.$Message.success("邮箱开关更新成功");
+        ElMessage.success("邮箱开关更新成功");
      }
    },
  },
--- a/manager/src/views/sys/message/noticeMessageTemplate.vue
+++ b/manager/src/views/sys/message/noticeMessageTemplate.vue
@@ -354,6 +354,7 @@
 </template>

 <script>
+import { ElMessage, ElMessageBox } from "element-plus";
 import * as API_Setting from "@/api/setting.js";
 import * as API_Other from "@/api/other.js";
 import * as API_Shop from "@/api/shops.js";
@@ -545,18 +546,14 @@ export default {
      });
    },
    removeMessage(id) {
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认删除此站内信 ?",
-        onOk: () => {
+      ElMessageBox.confirm("您确认删除此站内信 ?", "确认删除", { type: "warning" }).then(() => {
          API_Setting.deleteMessage(id).then((res) => {
            if (res.success) {
-              this.$Message.success("删除成功");
+              ElMessage.success("删除成功");
            }
            this.getMessage();
          });
-        },
-      });
+      }).catch(() => {});
    },
    sendMessage() {
      this.messageModalVisible = true;
@@ -586,7 +583,7 @@ export default {
      }

      if (this.messageSendForm.userIds.length <= 0 && this.messageSendForm.messageRange == "APPOINT") {
-        this.$Message.error("请选择发送对象");
+        ElMessage.error("请选择发送对象");
        return;
      }
      this.$refs["messageSendForm"].validate((valid) => {
@@ -594,7 +591,7 @@ export default {
          API_Other.sendMessage(this.messageSendForm).then((res) => {
            this.loading = false;
            if (res.success) {
-              this.$Message.success("发送成功");
+              ElMessage.success("发送成功");
              this.messageModalVisible = false;
              this.getMessage();
            }
@@ -656,7 +653,7 @@ export default {
          API_Setting.editNoticeMessage(this.form.id, params).then((res) => {
            this.submitLoading = false;
            if (res.success) {
-              this.$Message.success("修改成功");
+              ElMessage.success("修改成功");
              this.modalVisible = false;
              this.getNoticeMessage();
            }
@@ -704,7 +701,7 @@ export default {
    disable(v) {
      API_Setting.updateMessageStatus(v.id, "CLOSE").then((res) => {
        if (res.success) {
-          this.$Message.success("禁用成功");
+          ElMessage.success("禁用成功");
          this.getNoticeMessage();
        }
      });
@@ -712,7 +709,7 @@ export default {
    enable(v) {
      API_Setting.updateMessageStatus(v.id, "OPEN").then((res) => {
        if (res.success) {
-          this.$Message.success("启用成功");
+          ElMessage.success("启用成功");
          this.getNoticeMessage();
        }
      });
--- a/manager/src/views/sys/message/sms.scss
+++ b/manager/src/views/sys/message/sms.scss
@@ -129,19 +129,10 @@ methodItem h4 {
 .scroll-card {
  margin: 5px 0;
 }
-.ivu-card-body {
-  padding: 1px;
-  margin-left: 7px;
-}
 .checkbox-tag {
  height: 35px;
  width: 100%;
 }
-.ivu-tag-border.ivu-tag-closable .ivu-icon-ios-close {
-  margin-right: 68px !important;
-  left: 7px;
-  top: 0px;
-}

 .message-title{
  background-color: #fff5eb;
--- a/manager/src/views/sys/message/sms.vue
+++ b/manager/src/views/sys/message/sms.vue
@@ -287,6 +287,7 @@
 </template>

 <script>
+import { ElMessage, ElMessageBox } from "element-plus";
 import * as API_Setting from "@/api/setting.js";
 import * as API_Member from "@/api/member.js";

@@ -405,7 +406,7 @@ export default {
    },
    moveMember(index, item) {
      if (!item.mobile) {
-        this.$Message.error("当前用户暂无手机号绑定");
+        ElMessage.error("当前用户暂无手机号绑定");
        return false;
      }
      item.____selected = true;
@@ -505,20 +506,14 @@ export default {
      this.smsForm.context = this.smsTemplateContent;
    },
    deleteSmsTemplate(v) {
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除此短信模板？",
-        loading: true,
-        onOk: () => {
+      ElMessageBox.confirm("您确认要删除此短信模板？", "确认删除", { type: "warning" }).then(() => {
          API_Setting.deleteSmsTemplatePage({ templateCode: v.templateCode }).then((res) => {
-            this.$Modal.remove();
            if (res.success) {
-              this.$Message.success("删除成功");
+              ElMessage.success("删除成功");
              this.getSmsTemplate();
            }
          });
-        },
-      });
+      }).catch(() => {});
    },
    sendSms() {
      this.$refs.smsForm.validate((valid) => {
@@ -526,7 +521,7 @@ export default {
        this.smsForm.mobile = this.alreadyCheck;
        API_Setting.sendSms(this.smsForm).then((res) => {
          if (res.success) {
-            this.$Message.success("发送成功");
+            ElMessage.success("发送成功");
            this.getSms();
            this.sendSmsModal = false;
          }
@@ -553,7 +548,7 @@ export default {
      API_Setting.syncSign().then((res) => {
        this.loading = false;
        if (res.success) {
-          this.$Message.success("同步成功");
+          ElMessage.success("同步成功");
          this.getSmsSign();
        }
      });
@@ -570,7 +565,7 @@ export default {
          .then((res) => {
            this.submitLoading = false;
            if (res.success) {
-              this.$Message.success(this.modalType == 0 ? "添加成功" : "修改成功");
+              ElMessage.success(this.modalType == 0 ? "添加成功" : "修改成功");
              this.templateModalVisible = false;
              this.getSmsTemplate();
            }
@@ -581,27 +576,21 @@ export default {
      });
    },
    deleteSmsSign(v) {
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除此短信签名？",
-        loading: true,
-        onOk: () => {
+      ElMessageBox.confirm("您确认要删除此短信签名？", "确认删除", { type: "warning" }).then(() => {
          API_Setting.deleteSign(v.id).then((res) => {
-            this.$Modal.remove();
            if (res.success) {
-              this.$Message.success("删除成功");
+              ElMessage.success("删除成功");
              this.getSmsSign();
            }
          });
-        },
-      });
+      }).catch(() => {});
    },
    syncTemplate() {
      this.loading = true;
      API_Setting.syncTemplate().then((res) => {
        this.loading = false;
        if (res.success) {
-          this.$Message.success("同步成功");
+          ElMessage.success("同步成功");
          this.getSmsTemplate();
        }
      });
--- a/manager/src/views/sys/message/smsSign.vue
+++ b/manager/src/views/sys/message/smsSign.vue
@@ -61,6 +61,7 @@
 </template>

 <script>
+import { ElMessage } from "element-plus";
 import * as API_Setting from "@/api/setting.js";
 import uploadPicThumb from "@/components/lili/upload-pic-thumb";

@@ -97,11 +98,11 @@ export default {
    },
    addSignSubmit() {
      if (this.form.businessLicense == "" || this.form.license == "") {
-        this.$Message.error("请完善证件信息");
+        ElMessage.error("请完善证件信息");
        return;
      }
      if (this.form.signSource === "" || this.form.signSource === null || this.form.signSource === undefined) {
-        this.$Message.error("请选择签名来源");
+        ElMessage.error("请选择签名来源");
        return;
      }
      this.$refs.form.validate((valid) => {
@@ -112,7 +113,7 @@ export default {
              .then((res) => {
                this.loading = false;
                if (res.success) {
-                  this.$Message.success("添加成功");
+                  ElMessage.success("添加成功");
                  this.$router.back();
                }
              })
@@ -124,7 +125,7 @@ export default {
              .then((res) => {
                this.loading = false;
                if (res.success) {
-                  this.$Message.success("修改成功");
+                  ElMessage.success("修改成功");
                  this.$router.back();
                }
              })
--- a/manager/src/views/sys/oss-manage/ossManage.scss
+++ b/manager/src/views/sys/oss-manage/ossManage.scss
@@ -16,125 +16,6 @@
  display: none;
 }

-.oss-wrapper {
-  display: flex;
-  flex-wrap: wrap;
-  position: relative;
-}
-
-.oss-card {
-  margin: 10px 20px 10px 0;
-  width: 290px;
-
-  :hover {
-    .content .other .name {
-      color: #1890ff;
-      transition: color .3s;
-    }
-  }
-
-  cursor: pointer;
-
-  .ivu-card-body {
-    padding: 0;
-  }
-
-  .content {
-    display: flex;
-    flex-direction: column;
-
-    :hover {
-      .play {
-        transition: opacity .3s;
-        opacity: 1 !important;
-      }
-    }
-
-    .img {
-      height: 135px;
-      object-fit: cover;
-    }
-
-    .video {
-      height: 135px;
-      position: relative;
-
-      .cover {
-        height: 100%;
-        width: 100%;
-        object-fit: fill;
-      }
-
-      .play {
-        position: absolute;
-        top: 43px;
-        left: 117px;
-        height: 50px;
-        width: 50px;
-        opacity: 0.8;
-      }
-    }
-
-    .other {
-      padding: 16px;
-      height: 135px;
-
-      .name {
-        font-size: 16px;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
-        color: rgba(0, 0, 0, .85);
-        font-weight: 500;
-        margin-bottom: 4px;
-      }
-
-      .key {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        height: 45px;
-        word-break: break-all;
-        color: rgba(0, 0, 0, .45);
-      }
-
-      .info {
-        font-size: 12px;
-        color: rgba(0, 0, 0, .45);
-        overflow: hidden;
-        text-overflow: ellipsis;
-        height: 36px;
-        word-break: break-all;
-      }
-    }
-
-    .actions {
-      display: flex;
-      align-items: center;
-      height: 50px;
-      background: #f7f9fa;
-      border-top: 1px solid #e8e8e8;
-
-      i:hover {
-        color: #1890ff;
-      }
-
-      .btn {
-        display: flex;
-        justify-content: center;
-        width: 33.33%;
-        border-right: 1px solid #e8e8e8;
-      }
-
-      .btn-no {
-        display: flex;
-        justify-content: center;
-        width: 33.33%;
-      }
-    }
-  }
-}
-
-
 .oss-manage-box {
  .file-list {
    height: 100%;
@@ -254,7 +135,7 @@
    flex-direction: row-reverse;
  }

-  .demo-tree-render .ivu-tree-title{
+  .demo-tree-render .el-tree-node__label {
    width: 94%;
  }
 }
--- a/manager/src/views/sys/oss-manage/ossManage.vue
+++ b/manager/src/views/sys/oss-manage/ossManage.vue
@@ -100,8 +100,26 @@
  font-size: 16px;
 }

-.category-tabs-card {
-  margin-bottom: 0;
+.file-preview-fallback {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 48px 16px;
+  color: #606266;
+
+  .file-preview-name {
+    margin: 16px 0 8px;
+    font-size: 16px;
+    font-weight: 500;
+    word-break: break-all;
+    text-align: center;
+  }
+
+  .file-preview-tip {
+    margin: 0 0 20px;
+    color: #909399;
+  }
 }

 </style>
@@ -182,7 +200,7 @@
                        multiple
                        style="display: inline-block"
                      >
-                        <el-button>上传图片</el-button>
+                        <el-button>{{ uploadButtonText }}</el-button>
                      </el-upload>
                      <el-button v-if="!isComponent && showType == 'list'" @click="removeAll">批量删除</el-button>
                    </div>
@@ -229,9 +247,7 @@
                              </el-tooltip>
                            </div>
                            <div
-                              @click.prevent="
-                                isVideoFile(item) ? showVideo(item) : showPic(item)
-                              "
+                              @click.prevent="previewFile(item)"
                            >
                              <el-tooltip content="预览" placement="top">
                                <el-icon :size="22"><View /></el-icon>
@@ -264,166 +280,7 @@
            </el-col>
          </el-row>

-
-          <!--<div class="oss-operation padding-row">-->
-          <!--<div>-->
-          <!--<Upload-->
-          <!--ref="up"-->
-          <!--:action="managerApiUrl + '/manager/common/upload/file'"-->
-          <!--:data="{-->
-          <!--directoryPath: searchForm.fileDirectoryId,-->
-          <!--}"-->
-          <!--:headers="accessToken"-->
-          <!--:max-size="20480"-->
-          <!--:on-error="handleError"-->
-          <!--:on-exceeded-size="handleMaxSize"-->
-          <!--:on-success="handleSuccess"-->
-          <!--:show-upload-list="false"-->
-          <!--multiple-->
-          <!--style="display: inline-block"-->
-          <!--&gt;-->
-          <!--<Button>上传图片</Button>-->
-          <!--</Upload>-->
-          <!--<Dropdown @on-click="handleDropdown" v-if="!isComponent">-->
-          <!--<Button>-->
-          <!--更多操作-->
-          <!--<Icon type="md-arrow-dropdown"/>-->
-          <!--</Button>-->
-          <!--<DropdownMenu slot="list">-->
-          <!--<DropdownItem name="refresh">刷新</DropdownItem>-->
-          <!--<DropdownItem v-show="showType == 'list'" name="removeAll"-->
-          <!--&gt;批量删除-->
-          <!--</DropdownItem>-->
-          <!--</DropdownMenu>-->
-          <!--</Dropdown>-->
-          <!--</div>-->
-          <!--</div>-->
        </div>
-
-        <!--<Alert show-icon v-if="!isComponent">-->
-        <!--已选择-->
-        <!--<span>{{ selectCount }}</span> 项-->
-        <!--<a class="select-clear" @click="clearSelectAll">清空</a>-->
-        <!--<span v-if="selectCount > 0" style="margin-left: 15px"-->
-        <!--&gt;共计 {{ totalSize }} 存储量</span-->
-        <!--&gt;-->
-        <!--</Alert>-->
-
-        <!--<div v-show="showType === 'list'" >-->
-        <!--<div class="flex">-->
-        <!--<div class="article-category mr_10">-->
-        <!--<Tree-->
-        <!--:data="treeData"-->
-        <!--@on-contextmenu="handleContextMenu"-->
-        <!--@on-select-change="handleCateChange"-->
-        <!--&gt;-->
-        <!--<template slot="contextMenu" v-if="!isComponent">-->
-        <!--<DropdownItem @click.native="handleContextMenuEdit"-->
-        <!--&gt;编辑-->
-        <!--</DropdownItem-->
-        <!--&gt;-->
-        <!--<DropdownItem-->
-        <!--style="color: #ed4014"-->
-        <!--@click.native="handleContextMenuDelete"-->
-        <!--&gt;删除-->
-        <!--</DropdownItem-->
-        <!--&gt;-->
-        <!--</template>-->
-        <!--</Tree>-->
-        <!--<Alert v-if="!isComponent">鼠标右键编辑/删除分组</Alert>-->
-        <!--<div class="group-row flex" v-if="!isComponent">-->
-        <!--<Button @click="handleClickAddGroup">添加分组</Button>-->
-        <!--</div>-->
-        <!--</div>-->
-
-        <!--<Table-->
-        <!--ref="table"-->
-        <!--:columns="isComponent ? viewColumns : columns"-->
-        <!--:data="data"-->
-        <!--:loading="loading"-->
-        <!--border-->
-        <!--class="table"-->
-        <!--sortable="custom"-->
-        <!--@on-sort-change="changeSort"-->
-        <!--@on-selection-change="changeSelect"-->
-        <!--&gt;-->
-        <!--<template slot="fileKey" slot-scope="{ row }">-->
-        <!--<a @click="copyFileUrl(row)">{{ row.fileKey }}</a>-->
-        <!--</template>-->
-        <!--</Table>-->
-        <!--</div>-->
-        <!--</div>-->
-
-        <!--<div v-show="showType === 'thumb'">-->
-        <!--<div class="oss-wrapper">-->
-        <!--<Card v-for="(item, i) in data" :key="i" class="oss-card">-->
-        <!--<div class="content">-->
-        <!--<img-->
-        <!--v-if="item.fileType.indexOf('image') >= 0"-->
-        <!--:src="item.url"-->
-        <!--class="img"-->
-        <!--@click="showPic(item)"-->
-        <!--/>-->
-        <!--<div-->
-        <!--v-else-if="item.fileType.indexOf('video') >= 0"-->
-        <!--class="video"-->
-        <!--@click="showVideo(item)"-->
-        <!--&gt;-->
-        <!--&lt;!&ndash; 文件小于5MB显示video &ndash;&gt;-->
-        <!--<video v-if="item.fileSize < 1024 * 1024 * 5" class="cover">-->
-        <!--<source :src="item.url"/>-->
-        <!--</video>-->
-        <!--<img class="play" src="@/assets/play.png"/>-->
-        <!--</div>-->
-        <!--<div v-else class="other">-->
-        <!--<div class="name">{{ item.name }}</div>-->
-        <!--<div class="key">{{ item.fileKey }}</div>-->
-        <!--<div class="info">-->
-        <!--文件类型：{{ item.fileType }} 文件大小：{{-->
-        <!--((item.fileSize * 1.0) / (1024 * 1024)).toFixed(2)-->
-        <!--}}-->
-        <!--MB 创建时间：{{ item.createTime }}-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--<div class="actions">-->
-        <!--<div class="btn">-->
-        <!--<Tooltip content="下载" placement="top">-->
-        <!--<Icon-->
-        <!--size="16"-->
-        <!--type="md-download"-->
-        <!--@click="download(item)"-->
-        <!--/>-->
-        <!--</Tooltip>-->
-        <!--</div>-->
-        <!--<div class="btn">-->
-        <!--<Tooltip content="重命名" placement="top">-->
-        <!--<Icon size="16" type="md-create" @click="rename(item)"/>-->
-        <!--</Tooltip>-->
-        <!--</div>-->
-        <!--<div class="btn-no">-->
-        <!--<Tooltip content="删除" placement="top">-->
-        <!--<Icon size="16" type="md-trash" @click="remove(item)"/>-->
-        <!--</Tooltip>-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--</Card>-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--<Row class="mt_10" justify="end" type="flex">-->
-        <!--<Page-->
-        <!--:current="searchForm.pageNumber"-->
-        <!--:page-size="searchForm.pageSize"-->
-        <!--:page-size-opts="pageSizeOpts"-->
-        <!--:total="total"-->
-        <!--show-elevator-->
-        <!--show-sizer-->
-        <!--show-total-->
-        <!--size="small"-->
-        <!--@on-change="changePage"-->
-        <!--@on-page-size-change="changePageSize"-->
-        <!--&gt;</Page>-->
-        <!--</Row>-->
      </el-card>
    </el-row>
    <el-dialog
@@ -450,7 +307,7 @@
    <el-dialog v-model="picVisible" :title="picTitle" width="600px">
      <img
        :src="file.url"
-        alt="无效的图片链接"
+        alt="图片加载失败"
        style="width: 100%; margin: 0 auto; display: block"
      />
      <template #footer>
@@ -458,14 +315,33 @@
      </template>
    </el-dialog>

+    <el-dialog v-model="fileVisible" :title="fileTitle" width="800px" destroy-on-close>
+      <iframe
+        v-if="isPdfFile(file)"
+        :src="file.url"
+        style="width: 100%; height: 70vh; border: none"
+        title="文件预览"
+      />
+      <div v-else class="file-preview-fallback">
+        <el-icon :size="64"><Document /></el-icon>
+        <p class="file-preview-name">{{ file.name }}</p>
+        <p class="file-preview-tip">该文件类型暂不支持在线预览</p>
+        <el-button type="primary" @click="download(file)">下载文件</el-button>
+      </div>
+      <template #footer>
+        <span>文件类型：{{ file.fileType }} 文件大小：{{ file.msize }} 创建时间：{{ file.createTime }}</span>
+      </template>
+    </el-dialog>
+
    <el-dialog
      v-model="videoVisible"
      :title="videoTitle"
      width="800px"
      destroy-on-close
      @close="closeVideo"
+      @opened="initDPlayer"
    >
-      <div id="dplayer"></div>
+      <div ref="dplayerRef"></div>
      <template #footer>
        <span>文件类型：{{ file.fileType }} 文件大小：{{ file.msize }} 创建时间：{{ file.createTime }}</span>
      </template>
@@ -497,6 +373,7 @@
 </template>

 <script>
+import { ElMessage, ElMessageBox } from "element-plus";
 import { Delete, Download, View, Document } from "@element-plus/icons-vue";
 import {
  addFileDirectory,
@@ -509,8 +386,8 @@ import {
 } from "@/api/index";
 import DPlayer from "dplayer";
 import {managerApiUrl} from "@/libs/axios";
-
-const config = require("@/config/index");
+import config from "@/config/index";
+import playIcon from "@/assets/play.png";

 let dp;
 export default {
@@ -562,10 +439,13 @@ export default {
      showType: "list", // 展示类型
      modalVisible: false, // 添加或编辑显示
      uploadVisible: false, // 上传展示
-      videoVisible: false, // 文件modal
-      picVisible: false, // 图片modal
-      picTitle: "", // 图片title
-      videoTitle: "", // 视频title
+      videoVisible: false, // 视频预览
+      picVisible: false, // 图片预览
+      fileVisible: false, // 文件预览
+      picTitle: "", // 图片 title
+      videoTitle: "", // 视频 title
+      fileTitle: "", // 文件 title
+      pendingVideoUrl: "", // 待播放视频地址
      modalTitle: "", // 添加或编辑标题
      activeRoleTab: "MANAGER",
      activeCategoryTab: "IMAGE",
@@ -659,7 +539,7 @@ export default {
              } else {
                return h("img", {
                  attrs: {
-                    src: require("@/assets/play.png"),
+                    src: playIcon,
                  },
                  style: {
                    cursor: "pointer",
@@ -860,7 +740,7 @@ export default {
              } else {
                return h("img", {
                  attrs: {
-                    src: require("@/assets/play.png"),
+                    src: playIcon,
                  },
                  style: {
                    cursor: "pointer",
@@ -1021,19 +901,31 @@ export default {
    canUploadImages() {
      return this.activeRoleTab === "MANAGER";
    },
+    uploadButtonText() {
+      const textMap = {
+        IMAGE: "上传图片",
+        VIDEO: "上传视频",
+        FILE: "上传文件",
+      };
+      return textMap[this.activeCategoryTab] || "上传图片";
+    },
    uploadData() {
-      return {
-        directoryPath: this.searchForm.fileDirectoryId,
+      const data = {
        userEnums: this.activeRoleTab,
        directoryType: this.activeRoleTab,
      };
+      const directoryId = this.searchForm.fileDirectoryId;
+      if (directoryId && directoryId !== "0") {
+        data.directoryPath = directoryId;
+      }
+      return data;
    },
  },

  methods: {
    beforeUpload(file) {
      if (!this.canUploadImages) {
-        this.$Message.warning("仅管理员模块支持上传图片");
+        ElMessage.warning("仅管理员模块支持上传图片");
        return false;
      }
      const maxSize = 20480 * 1024;
@@ -1221,18 +1113,14 @@ export default {
    },
    // 删除分组
    async handleContextMenuDelete(val) {
-      this.$Modal.confirm({
-        title: "提示",
-        content: "是否删除该分组",
-        onOk: async () => {
+      ElMessageBox.confirm("是否删除该分组", "提示", { type: "warning" }).then(async () => {
          const res = await delFileDirectory(this.selectedGroupData.value);
          if (res.success) {
-            this.$Message.success("删除成功!");
+            ElMessage.success("删除成功!");
            this.getDataList();
            this.getAllList();
          }
-        },
-      });
+      }).catch(() => {});
    },
    async submitAddGroup() {
      this.$refs["formValidate"].validate(async (valid) => {
@@ -1252,13 +1140,12 @@ export default {
          }

          if (res.success) {
-            this.$Message.success("操作成功!");
+            ElMessage.success("操作成功!");
            this.enableGroup = false;
            this.getAllList();
          }
-          this.$Modal.remove();
-        } else {
-          this.$Message.error("请填写完整信息!");
+          } else {
+          ElMessage.error("请填写完整信息!");
        }
      });
    },
@@ -1280,7 +1167,7 @@ export default {
      textArea.select();
      try {
        document.execCommand("copy");
-        this.$Message.success("复制成功");
+        ElMessage.success("复制成功");
      } catch (err) {
        console.error("Unable to copy to clipboard", err);
      }
@@ -1348,7 +1235,7 @@ export default {
    },
    handleSelectConfirm() {
      if (!this.selectedOss.length) {
-        this.$Message.warning("请选择图片");
+        ElMessage.warning("请选择图片");
        return;
      }
      const last = this.selectedOss[this.selectedOss.length - 1];
@@ -1370,29 +1257,45 @@ export default {
    },
    // 查看大图
    showPic(v) {
-      this.file = v;
-      this.file.msize = ((v.fileSize * 1.0) / (1024 * 1024)).toFixed(2) + " MB";
-
-      this.picTitle = v.name + "(" + v.fileKey + ")";
+      this.prepareFileMeta(v);
+      this.picTitle = v.name || "图片预览";
      this.picVisible = true;
    },
+    // 查看文件（PDF 等）
+    showFile(v) {
+      this.prepareFileMeta(v);
+      this.fileTitle = v.name || "文件预览";
+      this.fileVisible = true;
+    },
    // 查看视频
    showVideo(v) {
+      this.prepareFileMeta(v);
+      this.videoTitle = v.name || "视频预览";
+      this.pendingVideoUrl = v.url;
+      this.videoVisible = true;
+    },
+    initDPlayer() {
+      const container = this.$refs.dplayerRef;
+      if (!container || !this.pendingVideoUrl) return;
+      if (dp) {
+        dp.destroy();
+        dp = null;
+      }
      dp = new DPlayer({
-        container: document.getElementById("dplayer"),
+        container,
        screenshot: true,
        video: {
-          url: v.url,
+          url: this.pendingVideoUrl,
        },
      });
-      this.file = v;
-      this.file.msize = ((v.fileSize * 1.0) / (1024 * 1024)).toFixed(2) + " MB";
-      this.videoTitle = v.name + "(" + v.fileKey + ")";
-      this.videoVisible = true;
    },
    // 关闭视频
    closeVideo() {
-      dp.destroy();
+      if (dp) {
+        dp.destroy();
+        dp = null;
+      }
+      this.pendingVideoUrl = "";
    },
    // 分页 改变页码
    changePage(v) {
@@ -1470,26 +1373,45 @@ export default {
    isVideoFile(row) {
      return row?.fileCategory === "VIDEO" || (row?.fileType && row.fileType.includes("video"));
    },
+    isPdfFile(row) {
+      return (
+        row?.fileType === "application/pdf" ||
+        (row?.name && row.name.toLowerCase().endsWith(".pdf"))
+      );
+    },
+    previewFile(item) {
+      if (this.isVideoFile(item)) {
+        this.showVideo(item);
+      } else if (this.isImageFile(item)) {
+        this.showPic(item);
+      } else {
+        this.showFile(item);
+      }
+    },
+    prepareFileMeta(v) {
+      this.file = v;
+      this.file.msize = ((v.fileSize * 1.0) / (1024 * 1024)).toFixed(2) + " MB";
+    },
    // 上传文件超过大小限制
    handleMaxSize() {
-      this.$Message.warning("所选文件大小过大，不得超过 20MB");
+      ElMessage.warning("所选文件大小过大，不得超过 20MB");
    },
    // 上传成功回调
    handleSuccess(res, file) {
      if (!this.canUploadImages) {
-        this.$Message.warning("仅管理员模块支持上传图片");
+        ElMessage.warning("仅管理员模块支持上传图片");
        return;
      }
      if (res.success) {
-        this.$Message.success("上传文件 " + file.name + " 成功");
+        ElMessage.success("上传文件 " + file.name + " 成功");
        this.getDataList();
      } else {
-        this.$Message.error(res.message);
+        ElMessage.error(res.message);
      }
    },
    // 上传失败回调
    handleError(error, file, fileList) {
-      this.$Message.error(error.toString());
+      ElMessage.error(error.toString());
    },
    // 清空上传文件
    clearFiles() {
@@ -1508,50 +1430,38 @@ export default {
    // 批量删除文件
    removeAll() {
      if (this.selectCount <= 0) {
-        this.$Message.warning("您还未选择要删除的数据");
+        ElMessage.warning("您还未选择要删除的数据");
        return;
      }
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除所选的 " + this.selectCount + " 个文件?",
-        loading: true,
-        onOk: () => {
+      ElMessageBox.confirm("您确认要删除所选的 " + this.selectCount + " 个文件?", "确认删除", { type: "warning" }).then(() => {
          let ids = "";
          this.selectList.forEach(function (e) {
            ids += e.id + ",";
          });
          ids = ids.substring(0, ids.length - 1);
          deleteFile(ids).then((res) => {
-            this.$Modal.remove();
            if (res.success) {
              this.selectedOss = [];
              // this.clearSelectAll();
              this.init();
-              this.$Message.success("批量删除文件成功");
+              ElMessage.success("批量删除文件成功");
            }
          })
            .catch((err) => {
              console.log("失败", err);
            });
-        },
-      });
+      }).catch(() => {});
    },
    // 单个删除文件
    remove(v) {
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除文件 " + v.name + " ?",
-        loading: true,
-        onOk: () => {
+      ElMessageBox.confirm("您确认要删除文件 " + v.name + " ?", "确认删除", { type: "warning" }).then(() => {
          deleteFile(v.id).then((res) => {
-            this.$Modal.remove();
            if (res.success) {
-              this.$Message.success("删除文件 " + v.name + " 成功");
+              ElMessage.success("删除文件 " + v.name + " 成功");
              this.getDataList();
            }
          })
-        },
-      });
+      }).catch(() => {});
    },
    // 提交修改文件名
    handleSubmit() {
@@ -1567,7 +1477,7 @@ export default {
          renameFile(params).then((res) => {
            this.submitLoading = false;
            if (res.success) {
-              this.$Message.success("操作成功");
+              ElMessage.success("操作成功");
              this.getDataList();
              this.modalVisible = false;
            }
--- a/manager/src/views/sys/role-manage/roleManage.vue
+++ b/manager/src/views/sys/role-manage/roleManage.vue
@@ -105,13 +105,13 @@
        </el-tree>
      </div>
      <template #footer>
-        <el-button @click="permModalVisible = false">取消</el-button>
        <el-select v-model="openLevel" style="width: 110px; margin-right: 10px" @change="changeOpen">
          <el-option value="0" label="展开所有" />
          <el-option value="1" label="收合所有" />
          <el-option value="2" label="仅展开一级" />
          <el-option value="3" label="仅展开两级" />
        </el-select>
+        <el-button @click="permModalVisible = false">取消</el-button>
        <el-button type="primary" :loading="submitPermLoading" @click="submitPermEdit()">编辑</el-button>
      </template>
    </el-dialog>
@@ -148,6 +148,7 @@
 </template>

 <script>
+import { ElMessage, ElMessageBox } from "element-plus";
 import {
  getRoleList,
  getAllPermissionList,
@@ -280,7 +281,7 @@ export default {
            addRole(this.roleForm).then((res) => {
              this.submitLoading = false;
              if (res.success) {
-                this.$Message.success("操作成功");
+                ElMessage.success("操作成功");
                this.getRoleList();
                this.roleModalVisible = false;
              }
@@ -291,7 +292,7 @@ export default {
            editRole(this.roleForm).then((res) => {
              this.submitLoading = false;
              if (res.success) {
-                this.$Message.success("操作成功");
+                ElMessage.success("操作成功");
                this.getRoleList();
                this.roleModalVisible = false;
              }
@@ -329,20 +330,14 @@ export default {
      });
    },
    remove(v) {
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除角色 " + v.name + " ?",
-        loading: true,
-        onOk: () => {
+      ElMessageBox.confirm("您确认要删除角色 " + v.name + " ?", "确认删除", { type: "warning" }).then(() => {
          deleteRole(v.id).then((res) => {
-            this.$Modal.remove();
            if (res.success) {
-              this.$Message.success("删除成功");
+              ElMessage.success("删除成功");
              this.getRoleList();
            }
          });
-        },
-      });
+      }).catch(() => {});
    },
    clearSelectAll() {
      this.$refs.table?.clearSelection();
@@ -353,29 +348,23 @@ export default {
    },
    delAll() {
      if (this.selectCount <= 0) {
-        this.$Message.warning("您还未选择要删除的数据");
+        ElMessage.warning("您还未选择要删除的数据");
        return;
      }
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
-        loading: true,
-        onOk: () => {
+      ElMessageBox.confirm("您确认要删除所选的 " + this.selectCount + " 条数据?", "确认删除", { type: "warning" }).then(() => {
          let ids = "";
          this.selectList.forEach(function (e) {
            ids += e.id + ",";
          });
          ids = ids.substring(0, ids.length - 1);
          deleteRole(ids).then((res) => {
-            this.$Modal.remove();
            if (res.success) {
-              this.$Message.success("删除成功");
+              ElMessage.success("删除成功");
              this.clearSelectAll();
              this.getRoleList();
            }
          });
-        },
-      });
+      }).catch(() => {});
    },
    async editPerm(v) {
      this.permData.map((item) => {
@@ -393,7 +382,7 @@ export default {
      });

      if (this.treeLoading) {
-        this.$Message.warning("菜单权限数据加载中，请稍后点击查看");
+        ElMessage.warning("菜单权限数据加载中，请稍后点击查看");
        return;
      }
      this.editRolePermId = v.id;
@@ -462,7 +451,7 @@ export default {
      saveRoleMenu(this.editRolePermId, this.saveRoleWay).then((res) => {
        this.superModelLoading = false;
        if (res.success) {
-          this.$Message.success("操作成功");
+          ElMessage.success("操作成功");
          this.$store.commit("setAdded", false);
          util.initRouter(this);
          this.getRoleList();
--- a/manager/src/views/sys/setting-manage/authLogin/CONNECT_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/authLogin/CONNECT_SETTING.vue
@@ -32,6 +32,7 @@
  </div>
 </template>
 <script>
+import { ElMessage } from "element-plus";
 import { setSetting } from "@/api/index";
 import { handleSubmit } from "../setting/validate";

@@ -61,9 +62,9 @@ export default {
    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
        if (res.success) {
-          this.$Message.success("保存成功!");
+          ElMessage.success("保存成功!");
        } else {
-          this.$Message.error("保存失败!");
+          ElMessage.error("保存失败!");
        }
      });
    },
--- a/manager/src/views/sys/setting-manage/authLogin/QQ_CONNECT.vue
+++ b/manager/src/views/sys/setting-manage/authLogin/QQ_CONNECT.vue
@@ -42,6 +42,7 @@
  </div>
 </template>
 <script>
+import { ElMessage } from "element-plus";
 import { setSetting } from "@/api/index";
 import { handleSubmit } from "../setting/validate";

@@ -80,12 +81,10 @@ export default {
        qqConnectSettingItemList: this.formValidate,
      }).then((res) => {
        if (res.success) {
-          this.$Message.success("保存成功!");
-          this.$Modal.remove();
-        } else {
-          this.$Message.error("保存失败!");
-          this.$Modal.remove();
-        }
+          ElMessage.success("保存成功!");
+          } else {
+          ElMessage.error("保存失败!");
+          }
      });
    },
    init() {
--- a/manager/src/views/sys/setting-manage/authLogin/WECHAT_CONNECT.vue
+++ b/manager/src/views/sys/setting-manage/authLogin/WECHAT_CONNECT.vue
@@ -42,6 +42,7 @@
  </div>
 </template>
 <script>
+import { ElMessage } from "element-plus";
 import { setSetting } from "@/api/index";
 import { handleSubmit } from "../setting/validate";

@@ -82,12 +83,10 @@ export default {
        wechatConnectSettingItems: this.formValidate,
      }).then((res) => {
        if (res.success) {
-          this.$Message.success("保存成功!");
-          this.$Modal.remove();
-        } else {
-          this.$Message.error("保存失败!");
-          this.$Modal.remove();
-        }
+          ElMessage.success("保存成功!");
+          } else {
+          ElMessage.error("保存失败!");
+          }
      });
    },
    init() {
--- a/manager/src/views/sys/setting-manage/pay/ALIPAY_PAYMENT.vue
+++ b/manager/src/views/sys/setting-manage/pay/ALIPAY_PAYMENT.vue
@@ -27,6 +27,7 @@
  </div>
 </template>
 <script>
+import { ElMessage } from "element-plus";
 import { setSetting } from "@/api/index";
 import { handleSubmit } from "../setting/validate";
 export default {
@@ -59,9 +60,9 @@ export default {
    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
        if (res.success) {
-          this.$Message.success("保存成功!");
+          ElMessage.success("保存成功!");
        } else {
-          this.$Message.error("保存失败!");
+          ElMessage.error("保存失败!");
        }
      });
    },
--- a/manager/src/views/sys/setting-manage/pay/PAYMENT_SUPPORT.vue
+++ b/manager/src/views/sys/setting-manage/pay/PAYMENT_SUPPORT.vue
@@ -38,6 +38,7 @@
  </div>
 </template>
 <script>
+import { ElMessage, ElMessageBox } from "element-plus";
 import { setSetting } from "@/api/index";
 import { handleSubmit } from "../setting/validate";
 import { getPaymentSupportForm } from "@/api/setting";
@@ -82,27 +83,19 @@ export default {
        .catch(() => {});
    },
    handleChangePayType(val) {
-      this.$Modal.confirm({
-        title: "修改支付设置",
-        content: "您是否修改此项？",
-        loading: true,
-        onOk: () => {
-          this.setupSetting();
-        },
-        onCancel: () => {
-          this.formValidate = JSON.parse(JSON.stringify(this.checkSupport));
-        },
+      ElMessageBox.confirm("您是否修改此项？", "修改支付设置", { type: "warning" }).then(() => {
+        this.setupSetting();
+      }).catch(() => {
+        this.formValidate = JSON.parse(JSON.stringify(this.checkSupport));
      });
    },
    setupSetting() {
      setSetting(this.type, { paymentSupportItems: this.formValidate }).then((res) => {
        if (res.success) {
          this.checkSupport = JSON.parse(JSON.stringify(this.formValidate));
-          this.$Message.success("保存成功!");
-          this.$Modal.remove();
+          ElMessage.success("保存成功!");
        } else {
-          this.$Message.error("保存失败!");
-          this.$Modal.remove();
+          ElMessage.error("保存失败!");
        }
      });
    },
--- a/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
+++ b/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
@@ -58,6 +58,7 @@
  </div>
 </template>
 <script>
+import { ElMessage } from "element-plus";
 import { setSetting } from "@/api/index";
 import { handleSubmit } from "../setting/validate";

@@ -84,9 +85,9 @@ export default {
    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
        if (res.success) {
-          this.$Message.success("保存成功!");
+          ElMessage.success("保存成功!");
        } else {
-          this.$Message.error("保存失败!");
+          ElMessage.error("保存失败!");
        }
      });
    },
--- a/manager/src/views/sys/setting-manage/platformSetting.vue
+++ b/manager/src/views/sys/setting-manage/platformSetting.vue
@@ -130,6 +130,7 @@
 </template>

 <script>
+import { ElMessage } from "element-plus";
 import { getParams, editParams } from "@/api/platform.js";
 import uploadPicInput from "@/components/lili/upload-pic-input";
 import { regular } from "@/utils";
@@ -446,7 +447,7 @@ export default {
          editParams(this.base, "base").then((res) => {
            this.saveLoading = false;
            if (res.success) {
-              this.$Message.success("保存成功");
+              ElMessage.success("保存成功");
            }
          });
        }
@@ -460,7 +461,7 @@ export default {
          editParams(this.point, "point").then((res) => {
            this.saveLoading = false;
            if (res.success) {
-              this.$Message.success("保存成功");
+              ElMessage.success("保存成功");
            }
          });
        }
@@ -474,7 +475,7 @@ export default {
          editParams(this.order, "order").then((res) => {
            this.saveLoading = false;
            if (res.success) {
-              this.$Message.success("保存成功");
+              ElMessage.success("保存成功");
            }
          });
        }
@@ -488,7 +489,7 @@ export default {
          editParams(this.goods, "goods").then((res) => {
            this.saveLoading = false;
            if (res.success) {
-              this.$Message.success("保存成功");
+              ElMessage.success("保存成功");
            }
          });
        }
@@ -502,7 +503,7 @@ export default {
          editParams(this.wechat, "wechat").then((res) => {
            this.saveLoading = false;
            if (res.success) {
-              this.$Message.success("保存成功");
+              ElMessage.success("保存成功");
            }
          });
        }
@@ -516,7 +517,7 @@ export default {
          editParams(this.qq, "qq").then((res) => {
            this.saveLoading = false;
            if (res.success) {
-              this.$Message.success("保存成功");
+              ElMessage.success("保存成功");
            }
          });
        }
@@ -530,7 +531,7 @@ export default {
          editParams(this.weibo, "weibo").then((res) => {
            this.saveLoading = false;
            if (res.success) {
-              this.$Message.success("保存成功");
+              ElMessage.success("保存成功");
            }
          });
        }
@@ -544,7 +545,7 @@ export default {
          editParams(this.alipay, "alipay").then((res) => {
            this.saveLoading = false;
            if (res.success) {
-              this.$Message.success("保存成功");
+              ElMessage.success("保存成功");
            }
          });
        }
--- a/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
@@ -79,6 +79,7 @@
  </div>
 </template>
 <script>
+import { ElMessage } from "element-plus";
 import { setSetting } from "@/api/index";
 import { handleSubmit } from "./validate";
 import ossManage from "@/views/sys/oss-manage/ossManage";
@@ -138,12 +139,12 @@ export default {
    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
        if (res.success) {
-          this.$Message.success("保存成功!");
+          ElMessage.success("保存成功!");
          localStorage.setItem("icon", this.formValidate.domainLogo);
          window.document.title = this.formValidate.siteName + " - 运营后台";
          this.setStore("title", this.formValidate.siteName);
        } else {
-          this.$Message.error("保存失败!");
+          ElMessage.error("保存失败!");
        }
      });
    },
--- a/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
@@ -59,7 +59,8 @@
  </div>
 </template>
 <script>
-import { setSetting } from "@/api/index";
+import { ElMessage } from "element-plus";
+import { setSetting, createIndex, getProgress, deleteGoodsDown, generateGoodsCache, delSkuIndex } from "@/api/index";
 export default {
  props: ["res", "type"],
  data() {
@@ -86,16 +87,79 @@ export default {
        if (valid) {
          this.setupSetting();
        } else {
-          this.$Message.error("请正确填写内容!");
+          ElMessage.error("请正确填写内容!");
+        }
+      });
+    },
+    createIndex() {
+      createIndex().then((res) => {
+        if (res.success) {
+          ElMessage.success("开始生成!");
+          this.showProgress = true;
+          setTimeout(() => {
+            this.intervalProgress = setInterval(() => {
+              getProgress().then((resp) => {
+                const progressResult = resp.result;
+                if (progressResult != null && progressResult.flag === 0) {
+                  clearInterval(this.intervalProgress);
+                  this.showProgress = false;
+                  ElMessage.success("生成成功!");
+                } else {
+                  this.progressVal = Math.floor((progressResult.processed / progressResult.total) * 100);
+                }
+              });
+            }, 1000);
+          }, 10000);
+        } else if (res.code === 100000) {
+          this.showProgress = true;
+          this.intervalProgress = setInterval(() => {
+            getProgress().then((resp) => {
+              const progressResult = resp.result;
+              if (progressResult != null && progressResult.flag === 0) {
+                clearInterval(this.intervalProgress);
+                this.showProgress = false;
+                ElMessage.success("生成成功!");
+              } else {
+                this.progressVal = Math.floor((progressResult.processed / progressResult.total) * 100);
+              }
+            });
+          }, 1000);
+        }
+      });
+    },
+    deleteDownGoods() {
+      deleteGoodsDown().then((res) => {
+        if (res.success) {
+          ElMessage.success("删除成功!");
+        } else {
+          ElMessage.error("删除失败!");
+        }
+      });
+    },
+    generateCache() {
+      generateGoodsCache().then((res) => {
+        if (res.success) {
+          ElMessage.success("生成成功!");
+        } else {
+          ElMessage.error("生成失败!");
+        }
+      });
+    },
+    deleteNotExistIndex() {
+      delSkuIndex().then((res) => {
+        if (res.success) {
+          ElMessage.success("删除成功!");
+        } else {
+          ElMessage.error("删除失败!");
        }
      });
    },
    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
        if (res.success) {
-          this.$Message.success("保存成功!");
+          ElMessage.success("保存成功!");
        } else {
-          this.$Message.error("保存失败!");
+          ElMessage.error("保存失败!");
        }
      });
    },
--- a/manager/src/views/sys/setting-manage/setting/IM_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/IM_SETTING.vue
@@ -13,6 +13,7 @@
  </div>
 </template>
 <script>
+import { ElMessage } from "element-plus";
 import {setSetting} from "@/api/index";
 import {handleSubmit} from "./validate";

@@ -43,9 +44,9 @@ export default {
    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
        if (res.success) {
-          this.$Message.success("保存成功!");
+          ElMessage.success("保存成功!");
        } else {
-          this.$Message.error("保存失败!");
+          ElMessage.error("保存失败!");
        }
      });
    },
--- a/manager/src/views/sys/setting-manage/setting/LIVE_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/LIVE_SETTING.vue
@@ -58,6 +58,7 @@
 </template>

 <script>
+import { ElMessage } from "element-plus";
 import { setSetting } from "@/api/index";

 const DEFAULT_FORM = {
@@ -113,7 +114,7 @@ export default {
        if (valid) {
          this.setupSetting();
        } else {
-          this.$Message.error("请正确填写内容!");
+          ElMessage.error("请正确填写内容!");
        }
      });
    },
@@ -124,9 +125,9 @@ export default {
      });
      setSetting(this.type, payload).then((res) => {
        if (res.success) {
-          this.$Message.success("保存成功!");
+          ElMessage.success("保存成功!");
        } else {
-          this.$Message.error("保存失败!");
+          ElMessage.error("保存失败!");
        }
      });
    },
--- a/manager/src/views/sys/setting-manage/setting/LOGISTICS_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/LOGISTICS_SETTING.vue
@@ -48,6 +48,7 @@
  </div>
 </template>
 <script>
+import { ElMessage } from "element-plus";
 import { setSetting } from "@/api/index";
 import { handleSubmit } from "./validate";
 export default {
@@ -80,9 +81,9 @@ export default {
    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
        if (res.success) {
-          this.$Message.success("保存成功!");
+          ElMessage.success("保存成功!");
        } else {
-          this.$Message.error("保存失败!");
+          ElMessage.error("保存失败!");
        }
      });
    },
--- a/manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/ORDER_SETTING.vue
@@ -41,6 +41,7 @@
  </div>
 </template>
 <script>
+import { ElMessage } from "element-plus";
 import { setSetting } from "@/api/index";
 import { handleSubmit } from "./validate";
 export default {
@@ -72,9 +73,9 @@ export default {
    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
        if (res.success) {
-          this.$Message.success("保存成功!");
+          ElMessage.success("保存成功!");
        } else {
-          this.$Message.error("保存失败!");
+          ElMessage.error("保存失败!");
        }
      });
    },
--- a/manager/src/views/sys/setting-manage/setting/OSS_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/OSS_SETTING.vue
@@ -82,6 +82,7 @@
  </div>
 </template>
 <script>
+import { ElMessage } from "element-plus";
 import {setSetting} from "@/api/index";
 import {handleSubmit} from "./validate";

@@ -130,9 +131,9 @@ export default {
    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
        if (res.success) {
-          this.$Message.success("保存成功!");
+          ElMessage.success("保存成功!");
        } else {
-          this.$Message.error("保存失败!");
+          ElMessage.error("保存失败!");
        }
      });
    },
--- a/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue
@@ -52,6 +52,7 @@
 </template>

 <script>
+import { ElMessage } from "element-plus";
 import { setSetting } from "@/api/index";
 import { handleSubmit } from "./validate";

@@ -78,9 +79,9 @@ export default {
    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
        if (res.success) {
-          this.$Message.success("保存成功!");
+          ElMessage.success("保存成功!");
        } else {
-          this.$Message.error("保存失败!");
+          ElMessage.error("保存失败!");
        }
      });
    },
@@ -89,9 +90,8 @@ export default {
    },
    addSign() {
      if (this.formValidate.pointSettingItems.length >= 4) {
-        this.$Message.error({
-          content: "最多设置4项签到设置",
-        });
+        ElMessage.error("最多设置4项签到设置",
+        );
        return false;
      }
      this.formValidate.pointSettingItems.push({
--- a/manager/src/views/sys/setting-manage/setting/SMS_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/SMS_SETTING.vue
@@ -78,6 +78,7 @@
  </div>
 </template>
 <script>
+import { ElMessage } from "element-plus";
 import {setSetting} from "@/api/index";
 import {handleSubmit} from "./validate";

@@ -125,9 +126,9 @@ export default {
    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
        if (res.success) {
-          this.$Message.success("保存成功!");
+          ElMessage.success("保存成功!");
        } else {
-          this.$Message.error("保存失败!");
+          ElMessage.error("保存失败!");
        }
      });
    },
--- a/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue
@@ -27,6 +27,7 @@
  </div>
 </template>
 <script>
+import { ElMessage } from "element-plus";
 import { setSetting } from "@/api/index";
 import { handleSubmit } from "./validate";
 export default {
@@ -53,9 +54,9 @@ export default {
    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
        if (res.success) {
-          this.$Message.success("保存成功!");
+          ElMessage.success("保存成功!");
        } else {
-          this.$Message.error("保存失败!");
+          ElMessage.error("保存失败!");
        }
      });
    },
--- a/manager/src/views/sys/setting-manage/setting/validate.js
+++ b/manager/src/views/sys/setting-manage/setting/validate.js
@@ -1,3 +1,4 @@
+import { ElMessage } from "element-plus";
 //表单中必填
 export function validateRequired(rule, value, callback) {
  if (value !== undefined && value !== null && value !== "") {
@@ -12,7 +13,7 @@ export function handleSubmit(that, name) {
  return new Promise((resolve, reject) => {
    const form = that.$refs[name];
    if (!form) {
-      that.$Message.error("表单未就绪，请稍后重试");
+      ElMessage.error("表单未就绪，请稍后重试");
      reject(new Error("form ref missing"));
      return;
    }
@@ -20,7 +21,7 @@ export function handleSubmit(that, name) {
      if (valid) {
        resolve(true);
      } else {
-        that.$Message.error("请正确填写内容!");
+        ElMessage.error("请正确填写内容!");
        reject(new Error("validation failed"));
      }
    });
--- a/manager/src/views/sys/setting-manage/smsSettingManage.vue
+++ b/manager/src/views/sys/setting-manage/smsSettingManage.vue
@@ -31,6 +31,7 @@
  </el-card>
 </template>
 <script>
+import { ElMessage } from "element-plus";
 import { getSetting, setSetting } from "@/api/index.js";
 import template from "./template";
 export default {
@@ -57,9 +58,9 @@ export default {
    saveSetting() {
      setSetting("SMS_SETTING", this.form).then((res) => {
        if (res.success) {
-          this.$Message.success("保存成功!");
+          ElMessage.success("保存成功!");
        } else {
-          this.$Message.error("保存失败!");
+          ElMessage.error("保存失败!");
        }
        this.modalVisible = false;
      });
--- a/manager/src/views/sys/slider/slider.vue
+++ b/manager/src/views/sys/slider/slider.vue
@@ -102,6 +102,7 @@
 </template>

 <script>
+import { ElMessage, ElMessageBox } from "element-plus";
 import * as API_Setting from "@/api/setting";
 import uploadPicInput from "@/components/lili/upload-pic-input";

@@ -206,7 +207,7 @@ export default {
          API_Setting.addVerification(payload).then((res) => {
            this.submitLoading = false;
            if (res.success) {
-              this.$Message.success("添加成功");
+              ElMessage.success("添加成功");
              this.getDataList();
              this.modalVisible = false;
            }
@@ -215,7 +216,7 @@ export default {
          API_Setting.editVerification(this.form.id, this.form).then((res) => {
            this.submitLoading = false;
            if (res.success) {
-              this.$Message.success("修改成功");
+              ElMessage.success("修改成功");
              this.getDataList();
              this.modalVisible = false;
            }
@@ -224,18 +225,14 @@ export default {
      });
    },
    remove(v) {
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "确认要删除此验证码源?",
-        onOk: () => {
+      ElMessageBox.confirm("确认要删除此验证码源?", "确认删除", { type: "warning" }).then(() => {
          return API_Setting.delVerification(v.id).then((res) => {
            if (res.success) {
-              this.$Message.success("验证码源已删除");
+              ElMessage.success("验证码源已删除");
              this.getDataList();
            }
          });
-        },
-      });
+      }).catch(() => {});
    },
  },
  mounted() {
--- a/manager/src/views/sys/user-manage/userManage.vue
+++ b/manager/src/views/sys/user-manage/userManage.vue
@@ -137,6 +137,7 @@
 </template>

 <script>
+import { ElMessage, ElMessageBox } from "element-plus";
 import {
  getUserListData,
  getAllRoleList,
@@ -262,29 +263,23 @@ export default {
    },
    resetPass() {
      if (this.selectCount == 0) {
-        this.$Message.warning("请选中数据后重试!");
+        ElMessage.warning("请选中数据后重试!");
        return;
      }
-      this.$Modal.confirm({
-        title: "确认重置",
-        content: "您确认要重置所选的 " + this.selectCount + " 条用户数据密码为【123456】?",
-        loading: true,
-        onOk: () => {
+      ElMessageBox.confirm("您确认要重置所选的 " + this.selectCount + " 条用户数据密码为【123456】?", "确认重置", { type: "warning" }).then(() => {
          let ids = "";
          this.selectList.forEach(function (e) {
            ids += e.id + ",";
          });
          ids = ids.substring(0, ids.length - 1);
          resetPassword(ids).then((res) => {
-            this.$Modal.remove();
            if (res.success) {
-              this.$Message.success("操作成功");
+              ElMessage.success("操作成功");
              this.clearSelectAll();
              this.getUserList();
            }
          });
-        },
-      });
+      }).catch(() => {});
    },
    submitUser() {
      this.$refs.form.validate((valid) => {
@@ -306,7 +301,7 @@ export default {
            addUser(params).then((res) => {
              this.submitLoading = false;
              if (res.success) {
-                this.$Message.success("操作成功");
+                ElMessage.success("操作成功");
                this.getUserList();
                this.userModalVisible = false;
              }
@@ -316,7 +311,7 @@ export default {
            editOtherUser(this.form).then((res) => {
              this.submitLoading = false;
              if (res.success) {
-                this.$Message.success("操作成功");
+                ElMessage.success("操作成功");
                this.getUserList();
                this.userModalVisible = false;
              }
@@ -369,53 +364,35 @@ export default {
    },
    enable(v) {
      let params = { status: true };
-      this.$Modal.confirm({
-        title: "确认启用",
-        content: "您确认要启用用户 " + v.username + " ?",
-        loading: true,
-        onOk: () => {
+      ElMessageBox.confirm("您确认要启用用户 " + v.username + " ?", "确认启用", { type: "warning" }).then(() => {
          enableUser(v.id, params).then((res) => {
-            this.$Modal.remove();
            if (res.success) {
-              this.$Message.success("操作成功");
+              ElMessage.success("操作成功");
              this.getUserList();
            }
          });
-        },
-      });
+      }).catch(() => {});
    },
    disable(v) {
      let params = { status: false };
-      this.$Modal.confirm({
-        title: "确认禁用",
-        content: "您确认要禁用用户 " + v.username + " ?",
-        loading: true,
-        onOk: () => {
+      ElMessageBox.confirm("您确认要禁用用户 " + v.username + " ?", "确认禁用", { type: "warning" }).then(() => {
          enableUser(v.id, params).then((res) => {
-            this.$Modal.remove();
            if (res.success) {
-              this.$Message.success("操作成功");
+              ElMessage.success("操作成功");
              this.getUserList();
            }
          });
-        },
-      });
+      }).catch(() => {});
    },
    remove(v) {
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除用户 " + v.username + " ?",
-        loading: true,
-        onOk: () => {
+      ElMessageBox.confirm("您确认要删除用户 " + v.username + " ?", "确认删除", { type: "warning" }).then(() => {
          deleteUser(v.id).then((res) => {
-            this.$Modal.remove();
            if (res.success) {
-              this.$Message.success("删除成功");
+              ElMessage.success("删除成功");
              this.getUserList();
            }
          });
-        },
-      });
+      }).catch(() => {});
    },
    showSelect(e) {
      this.exportData = e;
@@ -427,29 +404,23 @@ export default {
    },
    delAll() {
      if (this.selectCount <= 0) {
-        this.$Message.warning("您还未选择要删除的数据");
+        ElMessage.warning("您还未选择要删除的数据");
        return;
      }
-      this.$Modal.confirm({
-        title: "确认删除",
-        content: "您确认要删除所选的 " + this.selectCount + " 条数据?",
-        loading: true,
-        onOk: () => {
+      ElMessageBox.confirm("您确认要删除所选的 " + this.selectCount + " 条数据?", "确认删除", { type: "warning" }).then(() => {
          let ids = "";
          this.selectList.forEach(function (e) {
            ids += e.id + ",";
          });
          ids = ids.substring(0, ids.length - 1);
          deleteUser(ids).then((res) => {
-            this.$Modal.remove();
            if (res.success) {
-              this.$Message.success("删除成功");
+              ElMessage.success("删除成功");
              this.clearSelectAll();
              this.getUserList();
            }
          });
-        },
-      });
+      }).catch(() => {});
    },
  },
  mounted() {