From b0712811a0421dd3d4bc6ea03c54b7b39096439e Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 28 二月 2026 18:27:42 +0800
Subject: [PATCH] 提交
---
mini-program/main.js | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/mini-program/main.js b/mini-program/main.js
index cf97271..8d39cc3 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -8,11 +8,10 @@
App.mpType = 'app'
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/'
// Vue.prototype.$baseUrl = 'https://test.doumee.cn/dmmall_web_api/'
Vue.prototype.$onLaunched = new Promise(resolve => {
--
Gitblit v1.9.3