From 743368e075a887c8fa4879ee039742b287b25d70 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 28 二月 2026 16:28:02 +0800
Subject: [PATCH] 合并
---
mini-program/main.js | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/mini-program/main.js b/mini-program/main.js
index cf97271..92b704a 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -10,9 +10,10 @@
Vue.prototype.$store = store;
<<<<<<< HEAD
// Vue.prototype.$baseUrl = 'http://192.168.1.17:12015/'
-=======
->>>>>>> 8fd09daba5c89106b4a9aacd8d5ef9354afc93be
Vue.prototype.$baseUrl = 'http://192.168.0.7/dmmall_web_api/'
+=======
+Vue.prototype.$baseUrl = 'http://192.168.1.85:12015/'
+>>>>>>> 988b4e04541d15c7586efb72f565960b4de4c492
// Vue.prototype.$baseUrl = 'https://test.doumee.cn/dmmall_web_api/'
Vue.prototype.$onLaunched = new Promise(resolve => {
--
Gitblit v1.9.3