From 0e4b49f4bee160790b1830e6a8606e739b32fc3b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 11 三月 2026 09:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/main.js | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/mini-program/main.js b/mini-program/main.js
index 478dae2..74921e8 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -12,15 +12,10 @@
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