From e4f9739d74323aacf09d139700f22a383910ee97 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 04 三月 2026 10:38:32 +0800
Subject: [PATCH] 合并

---
 mini-program/unpackage/dist/dev/mp-weixin/common/main.js |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mini-program/unpackage/dist/dev/mp-weixin/common/main.js b/mini-program/unpackage/dist/dev/mp-weixin/common/main.js
index 7afeed5..14585e8 100644
--- a/mini-program/unpackage/dist/dev/mp-weixin/common/main.js
+++ b/mini-program/unpackage/dist/dev/mp-weixin/common/main.js
@@ -31,8 +31,10 @@
 _vue.default.config.productionTip = false;
 _App.default.mpType = 'app';
 _vue.default.prototype.$store = _index.default;
+
+// Vue.prototype.$baseUrl = 'http://192.168.1.17:12015/'
+// Vue.prototype.$baseUrl = 'http://192.168.1.85:12015/'
 _vue.default.prototype.$baseUrl = 'http://192.168.0.7/dmmall_web_api/';
-// // Vue.prototype.$baseUrl = 'http://192.168.1.85:12015/'
 // Vue.prototype.$baseUrl = 'https://test.doumee.cn/dmmall_web_api/'
 
 _vue.default.prototype.$onLaunched = new Promise(function (resolve) {
@@ -469,5 +471,5 @@
 /***/ })
 
 },[[0,"common/runtime","common/vendor"]]]);
->>>>>>> 5dbd5bdfc1a4de43722485b728f7d27f9b369eb9
+>>>>>>> 7b09a9950f13521190a4aef9bbc2a6163445566c
 //# sourceMappingURL=../../.sourcemap/mp-weixin/common/main.js.map
\ No newline at end of file

--
Gitblit v1.9.3