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 | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/mini-program/main.js b/mini-program/main.js
index bcf97c1..478dae2 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -9,15 +9,17 @@
Vue.prototype.$store = store;
-<<<<<<< HEAD
+
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/'
+<<<<<<< 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 = 'http://192.168.1.85:12015/'
->>>>>>> 5dbd5bdfc1a4de43722485b728f7d27f9b369eb9
// Vue.prototype.$baseUrl = 'https://test.doumee.cn/dmmall_web_api/'
+>>>>>>> 7b09a9950f13521190a4aef9bbc2a6163445566c
Vue.prototype.$onLaunched = new Promise(resolve => {
Vue.prototype.$isResolve = resolve
--
Gitblit v1.9.3