From ef46d13d5fa70d1c94f25de294f5ed177b751234 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 02 三月 2026 16:40:30 +0800
Subject: [PATCH] 提交
---
mini-program/main.js | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/mini-program/main.js b/mini-program/main.js
index 92b704a..4820581 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -8,12 +8,10 @@
App.mpType = 'app'
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/'
->>>>>>> 988b4e04541d15c7586efb72f565960b4de4c492
+
+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 => {
--
Gitblit v1.9.3