From 3696830fbaf2fd97d98020087abf20917e491bdc Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 23 四月 2026 20:06:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/main.js | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/small-program/main.js b/small-program/main.js
index a7204b7..79ee827 100644
--- a/small-program/main.js
+++ b/small-program/main.js
@@ -14,13 +14,9 @@
Vue.prototype.$isResolve = resolve;
})
-// Vue.prototype.$baseUrl = 'http://192.168.1.54:10011/'
-// Vue.prototype.$baseUrl = 'http://192.168.1.54:10011/'
+Vue.prototype.$baseUrl = 'http://192.168.1.4:10011'
+// Vue.prototype.$baseUrl = 'https://jinkuai.832smartfarm.com/jinkuai_web/'
-// Vue.prototype.$baseUrl = 'https://test.doumee.cn/jinkuai_web/'
-Vue.prototype.$baseUrl = 'https://jinkuai.832smartfarm.com/jinkuai_web/'
-import shareMixin from '@/utils/shareMixin'
-Vue.mixin(shareMixin)
const app = new Vue({
store,
...App
--
Gitblit v1.9.3