修改冲突

076ee6b1 · luo ying · e4df6230 · 076ee6b1
Commit 076ee6b1 authored Nov 18, 2020 by luo ying
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

iview.js plugins/iview.js +6 -4

No files found.
--- a/plugins/iview.js
+++ b/plugins/iview.js
@@ -168,14 +168,16 @@ Vue.component("Actions", Actions)
 Vue.component("DateRange", DateRange)
 Vue.component("Life", Life)
 Vue.component("FilesViewer", FilesViewer)
-Vue.component("FilesViewer", FilesViewer)
-Vue.component("Vcard", Vcard)
-Vue.component("BtnBox", BtnBox)
-Vue.component("RightM", RightM)
 Vue.use(Contextmenu);

 //注入mock
 // require("../mock")
+// Vue.component("Vcard", Vcard)
+// Vue.component("BtnBox", BtnBox)
+// Vue.component("RightM", RightM)
+//注入mock
+// require("../mock")
+
 Vue.prototype.$api = request;
 Vue.prototype.$http = Api;
 Vue.prototype.$u = Henq;