From b902b40fda2f1dccca0825277d07908119deecfd Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 三月 2026 09:57:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/main.js | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/mini-program/main.js b/mini-program/main.js
index f239899..8d39cc3 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -8,7 +8,11 @@
App.mpType = 'app'
Vue.prototype.$store = store;
-Vue.prototype.$baseUrl = 'http://192.168.1.37:12015/'
+
+// Vue.prototype.$baseUrl = 'http://192.168.1.17:12015/'
+Vue.prototype.$baseUrl = 'http://192.168.0.7/dmmall_web_api/'
+// Vue.prototype.$baseUrl = 'http://192.168.1.85:12015/'
+// Vue.prototype.$baseUrl = 'https://test.doumee.cn/dmmall_web_api/'
Vue.prototype.$onLaunched = new Promise(resolve => {
Vue.prototype.$isResolve = resolve
@@ -17,7 +21,8 @@
Vue.use(uView);
store.dispatch('getHeight')
-
+import shareMixin from '@/utils/shareMixin'
+Vue.mixin(shareMixin)
const app = new Vue({
store,
...App
--
Gitblit v1.9.3