From 1c5ca22f781214dba8057c7547461ba86fe06a95 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 24 二月 2025 10:47:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main.js | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main.js b/src/main.js
index 96becea..9ae30ea 100644
--- a/src/main.js
+++ b/src/main.js
@@ -43,6 +43,8 @@
import DictTag from "@/components/DictTag";
// 澶撮儴鏍囩缁勪欢
import VueMeta from "vue-meta";
+// 鏉″舰鐮佺敓鎴愮粍浠�
+import VueBarcode from "vue-barcode";
// 瀛楀吀鏁版嵁缁勪欢
import DictData from "@/components/DictData";
import { checkPermi } from "@/utils/permission"; // 鏉冮檺鍒ゆ柇鍑芥暟
@@ -61,7 +63,9 @@
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val));
};
-Vue.prototype.javaApi = process.env.VUE_APP_BASE_API;
+Vue.prototype.javaApi = process.env.VUE_APP_BASE_API
+ ? process.env.VUE_APP_BASE_API
+ : "http://192.168.1.36:8002";
Vue.prototype.checkPermi = checkPermi;
// 鍏ㄥ眬缁勪欢鎸傝浇
@@ -72,6 +76,7 @@
Vue.component("FileUpload", FileUpload);
Vue.component("ImageUpload", ImageUpload);
Vue.component("ImagePreview", ImagePreview);
+Vue.component("barcode", VueBarcode);
Vue.use(directive);
Vue.use(plugins);
--
Gitblit v1.9.3