From 11e35e0257e48667292b4f563ddf6ce02a3a22bb Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 三月 2026 13:49:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 mini-program/main.js |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/mini-program/main.js b/mini-program/main.js
index 49ff20f..57a0764 100644
--- a/mini-program/main.js
+++ b/mini-program/main.js
@@ -8,7 +8,10 @@
 App.mpType = 'app'
 
 Vue.prototype.$store = store;
+
+// Vue.prototype.$baseUrl = 'http://192.168.1.17:12015/'
 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 => {
 	Vue.prototype.$isResolve = resolve
@@ -17,7 +20,8 @@
 Vue.use(uView);
 
 store.dispatch('getHeight')
-
+import shareMixin from '@/utils/shareMixin'
+Vue.mixin(shareMixin)
 const app = new Vue({
 	store,
 	...App

--
Gitblit v1.9.3