报错

plugins/iview.js

@@ -166,23 +166,16 @@ Vue.component("Pictrue", Pictrue)
 Vue.component("WordTree", WordTree)
 Vue.component("Actions", Actions)
 Vue.component("DateRange", DateRange)
-Vue.component("Life", Life) <<
-    << << < HEAD
+Vue.component("Life", Life)
 Vue.component("FilesViewer", FilesViewer)
-Vue.use(Contextmenu);
-
-//注入mock
-// require("../mock")
-===
-=== =
 Vue.component("FilesViewer", FilesViewer)
 Vue.component("Vcard", Vcard)
 Vue.component("BtnBox", BtnBox)
 Vue.component("RightM", RightM)
-    //注入mock
-    // require("../mock")
-    >>>
-    >>> > mesui_20201104
+Vue.use(Contextmenu);
+
+//注入mock
+// require("../mock")
 Vue.prototype.$api = request;
 Vue.prototype.$http = Api;
 Vue.prototype.$u = Henq;