From 66b2fafb361fe1e04b1eb738ff632096e3816354 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 05 三月 2026 09:44:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/main.js | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/mini-program/main.js b/mini-program/main.js
index 4b87150..478dae2 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -10,10 +10,16 @@
Vue.prototype.$store = store;
-// Vue.prototype.$baseUrl = 'http://192.168.1.17:12015/'
+Vue.prototype.$baseUrl = 'http://192.168.1.17:12015/'
// Vue.prototype.$baseUrl = 'http://192.168.1.85:12015/'
+<<<<<<< HEAD
+// Vue.prototype.$baseUrl = 'http://192.168.0.7/dmmall_web_api/'
+// Vue.prototype.$baseUrl = 'https://test.doumee.cn/dmmall_web_api/'
+// Vue.prototype.$baseUrl = 'http://xiaopiqiu2.natapp1.cc/'
+=======
Vue.prototype.$baseUrl = 'http://192.168.0.7/dmmall_web_api/'
// Vue.prototype.$baseUrl = 'https://test.doumee.cn/dmmall_web_api/'
+>>>>>>> 7b09a9950f13521190a4aef9bbc2a6163445566c
Vue.prototype.$onLaunched = new Promise(resolve => {
Vue.prototype.$isResolve = resolve
--
Gitblit v1.9.3