From e4f9739d74323aacf09d139700f22a383910ee97 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 04 三月 2026 10:38:32 +0800
Subject: [PATCH] 合并
---
mini-program/main.js | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/mini-program/main.js b/mini-program/main.js
index eca346d..478dae2 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -8,7 +8,18 @@
App.mpType = 'app'
Vue.prototype.$store = store;
-Vue.prototype.$baseUrl = 'http://192.168.1.40:10014/'
+
+
+Vue.prototype.$baseUrl = 'http://192.168.1.17:12015/'
+// Vue.prototype.$baseUrl = 'http://192.168.1.85:12015/'
+<<<<<<< HEAD
+// Vue.prototype.$baseUrl = 'http://192.168.0.7/dmmall_web_api/'
+// Vue.prototype.$baseUrl = 'https://test.doumee.cn/dmmall_web_api/'
+// Vue.prototype.$baseUrl = 'http://xiaopiqiu2.natapp1.cc/'
+=======
+Vue.prototype.$baseUrl = 'http://192.168.0.7/dmmall_web_api/'
+// Vue.prototype.$baseUrl = 'https://test.doumee.cn/dmmall_web_api/'
+>>>>>>> 7b09a9950f13521190a4aef9bbc2a6163445566c
Vue.prototype.$onLaunched = new Promise(resolve => {
Vue.prototype.$isResolve = resolve
@@ -17,7 +28,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