From 0ee006792256a1089467b7f54e0eb5061c1afa12 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:21:49 +0800
Subject: [PATCH] 经销商管理
---
mini-program/main.js | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/mini-program/main.js b/mini-program/main.js
index bcf97c1..4b87150 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -9,14 +9,10 @@
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.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 = 'http://192.168.1.85:12015/'
->>>>>>> 5dbd5bdfc1a4de43722485b728f7d27f9b369eb9
// Vue.prototype.$baseUrl = 'https://test.doumee.cn/dmmall_web_api/'
Vue.prototype.$onLaunched = new Promise(resolve => {
--
Gitblit v1.9.3