From dd37247e65374dd4ef7e8e8b9212d8f29023e301 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 27 十二月 2021 09:50:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

---
 ruoyi-ui/src/plugins/modal.js |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ruoyi-ui/src/plugins/modal.js b/ruoyi-ui/src/plugins/modal.js
index 7df61a8..503a16f 100644
--- a/ruoyi-ui/src/plugins/modal.js
+++ b/ruoyi-ui/src/plugins/modal.js
@@ -59,6 +59,14 @@
       type: "warning",
     })
   },
+  // 鎻愪氦鍐呭
+  prompt(content) {
+    return MessageBox.prompt(content, "绯荤粺鎻愮ず", {
+      confirmButtonText: '纭畾',
+      cancelButtonText: '鍙栨秷',
+      type: "warning",
+    })
+  },
   // 鎵撳紑閬僵灞�
   loading(content) {
     loadingInstance = Loading.service({

--
Gitblit v1.9.3