From ed4eef49411cd7e673d1f9a16ef3f716f9ca1c28 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 25 二月 2025 17:46:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main.js | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main.js b/src/main.js
index 2e9f017..28883c0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -48,6 +48,7 @@
// 瀛楀吀鏁版嵁缁勪欢
import DictData from "@/components/DictData";
import { checkPermi } from "@/utils/permission"; // 鏉冮檺鍒ゆ柇鍑芥暟
+import { getToken } from "@/utils/auth";
// 鍏ㄥ眬鏂规硶鎸傝浇
Vue.prototype.getDicts = getDicts;
@@ -63,8 +64,13 @@
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.0.170:8002";
Vue.prototype.checkPermi = checkPermi;
+Vue.prototype.uploadHeader = {
+ Authorization: "Bearer " + getToken(),
+};
// 鍏ㄥ眬缁勪欢鎸傝浇
Vue.component("DictTag", DictTag);
@@ -74,7 +80,7 @@
Vue.component("FileUpload", FileUpload);
Vue.component("ImageUpload", ImageUpload);
Vue.component("ImagePreview", ImagePreview);
-Vue.component('barcode', VueBarcode)
+Vue.component("barcode", VueBarcode);
Vue.use(directive);
Vue.use(plugins);
--
Gitblit v1.9.3