From 60322c503d201e4d1000e62d8ecf17db4f628e4c Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 12 三月 2025 15:49:23 +0800
Subject: [PATCH] 合并冲突
---
src/main.js | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main.js b/src/main.js
index 870a586..59caa2b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -49,6 +49,7 @@
import { getToken } from "@/utils/auth";
// 鏃堕棿杞崲
import Moment from "moment";
+import basicContainer from './components/basic-container/main'
// 鍏ㄥ眬鏂规硶鎸傝浇
Vue.prototype.getDicts = getDicts;
@@ -66,11 +67,12 @@
};
Vue.prototype.javaApi = process.env.VUE_APP_BASE_API
? process.env.VUE_APP_BASE_API
- : "http://192.168.0.104:8002";
+ : "http://127.0.0.1:8002";
Vue.prototype.checkPermi = checkPermi;
Vue.prototype.uploadHeader = {
Authorization: "Bearer " + getToken(),
};
+
// 瑙ｅ喅el-radio-group鍗曢�夋鑷韩鐨刡ug
Vue.directive("removeAriaHidden", {
bind(el, binding) {
@@ -91,6 +93,8 @@
Vue.component("FileUpload", FileUpload);
Vue.component("ImageUpload", ImageUpload);
Vue.component("ImagePreview", ImagePreview);
+// 娉ㄥ唽鍏ㄥ眬瀹瑰櫒
+Vue.component('basicContainer', basicContainer)
Vue.use(directive);
Vue.use(plugins);
--
Gitblit v1.9.3