From 41115bb4b6d0161ff6d2c15ef6b3d5386a14ac9c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 02 三月 2026 16:40:54 +0800
Subject: [PATCH] 合并
---
mini-program/main.js | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/mini-program/main.js b/mini-program/main.js
index cf97271..bcf97c1 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -8,11 +8,15 @@
App.mpType = 'app'
Vue.prototype.$store = store;
+
<<<<<<< HEAD
-// Vue.prototype.$baseUrl = 'http://192.168.1.17: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/'
=======
->>>>>>> 8fd09daba5c89106b4a9aacd8d5ef9354afc93be
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.$onLaunched = new Promise(resolve => {
--
Gitblit v1.9.3