From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
bicycle/main.js | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/bicycle/main.js b/bicycle/main.js
index da2d5a3..ed0c934 100644
--- a/bicycle/main.js
+++ b/bicycle/main.js
@@ -4,19 +4,21 @@
import './uni.promisify.adaptor'
import store from './store/index.js'
-Vue.prototype.$store = store
+Vue.prototype.$store = store;
import uView from "uview-ui";
-Vue.use(uView);
+Vue.use(uView);
-Vue.config.productionTip = false
-App.mpType = 'app'
+Vue.config.productionTip = false;
+App.mpType = 'app';
Vue.prototype.$onLaunched = new Promise(resolve => {
- Vue.prototype.$isResolve = resolve
+ Vue.prototype.$isResolve = resolve;
})
-Vue.prototype.$baseUrl = 'http://192.168.0.15:10013/'
+// Vue.prototype.$baseUrl = 'http://192.168.0.15:10025/'
+Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/bike_h5_api/'
+// Vue.prototype.$baseUrl = 'http://xiaopiqiu.natapp1.cc/'
store.dispatch('getHeight')
--
Gitblit v1.9.3