Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -16,6 +16,14 @@ Vue.prototype.$rules = rules
 // 全局加载
 // 全局加载
 Vue.prototype.$startLoading = startLoadingAddCount
 Vue.prototype.$startLoading = startLoadingAddCount
 Vue.prototype.$endLoading = endLoadingSubCount
 Vue.prototype.$endLoading = endLoadingSubCount
+
+// 弹框
+import { popupDialog, popupCacel } from "./utils/popup.js";
+// 全局加载
+Vue.prototype.$popupDialog = popupDialog
+Vue.prototype.$popupCacel = popupDialog
+
+
 import { theme } from "@/directive/theme.js"
 import { theme } from "@/directive/theme.js"
 Vue.directive("theme", theme)
 Vue.directive("theme", theme)
 Vue.directive('fo', {
 Vue.directive('fo', {