From 1e6a4364d6e2636522aa4e1f679fb3b8f8997046 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 28 二月 2026 15:07:49 +0800
Subject: [PATCH] 合并
---
mini-program/main.js | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/mini-program/main.js b/mini-program/main.js
index ecca4eb..cf97271 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -8,7 +8,12 @@
App.mpType = 'app'
Vue.prototype.$store = store;
-Vue.prototype.$baseUrl = 'http://192.168.1.17:12015/'
+<<<<<<< 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 = 'https://test.doumee.cn/dmmall_web_api/'
Vue.prototype.$onLaunched = new Promise(resolve => {
Vue.prototype.$isResolve = resolve
--
Gitblit v1.9.3