From bc5d79cdd957fcee510d7a1cee07f6775af65596 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 03 三月 2026 10:04:46 +0800
Subject: [PATCH] 合并
---
mini-program/main.js | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/mini-program/main.js b/mini-program/main.js
index bcf97c1..e174e52 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -9,15 +9,11 @@
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.17:12015/'
// Vue.prototype.$baseUrl = 'http://192.168.1.85:12015/'
-=======
-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/'
+// Vue.prototype.$baseUrl = 'http://192.168.0.7/dmmall_web_api/'
+Vue.prototype.$baseUrl = 'https://test.doumee.cn/dmmall_web_api/'
Vue.prototype.$onLaunched = new Promise(resolve => {
Vue.prototype.$isResolve = resolve
--
Gitblit v1.9.3