From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/main.js | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/small-program/main.js b/small-program/main.js
index a7204b7..ce3d831 100644
--- a/small-program/main.js
+++ b/small-program/main.js
@@ -5,6 +5,9 @@
import uView from "uview-ui";
Vue.use(uView);
+import AuthLogin from '@/components/auth-login/auth-login.vue'
+Vue.component('auth-login', AuthLogin)
+
Vue.config.productionTip = false
App.mpType = 'app'
Vue.prototype.$store = store;
@@ -14,13 +17,10 @@
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://llfc.lmpro.cn/nyx_web/'
+Vue.prototype.$gaodeMapKey = 'e4d46c87adf151dca20060317592b1b6'
-// 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