From 6df768924d72455998127e0801480ced67a79cf6 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 三月 2026 10:00:26 +0800
Subject: [PATCH] 经销商管理
---
mini-program/main.js | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/mini-program/main.js b/mini-program/main.js
index 92b704a..8d39cc3 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -8,12 +8,10 @@
App.mpType = 'app'
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/'
->>>>>>> 988b4e04541d15c7586efb72f565960b4de4c492
+// 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