From bf7b975c7ebe94ac801d72671cefc4d6ec01d56e Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 23 三月 2026 09:39:07 +0800
Subject: [PATCH] 小程序 接口开发
---
mini-program/main.js | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/mini-program/main.js b/mini-program/main.js
index bcf97c1..74921e8 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -9,16 +9,13 @@
Vue.prototype.$store = store;
-<<<<<<< HEAD
-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/'
-=======
-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.$baseUrl = 'http://192.168.1.17:12015/'
+// Vue.prototype.$baseUrl = 'http://192.168.1.85:12015/'
+// 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.$onLaunched = new Promise(resolve => {
Vue.prototype.$isResolve = resolve
})
--
Gitblit v1.9.3