From 0df3c99a23b6774c39abf16af51cf20bbfefc8a5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 10 五月 2024 15:54:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/main.js | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/h5/main.js b/h5/main.js
index 2d18e67..8f6f90a 100644
--- a/h5/main.js
+++ b/h5/main.js
@@ -5,26 +5,40 @@
import uView from "uview-ui"
import store from './store/index.js'
+import Tabbar from '@/components/tarbar.vue'
+import navigation from '@/components/Header.vue'
+
Vue.config.productionTip = false
-Vue.prototype.$baseUrl = 'api/';
+
// Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/h5_api/';
// Vue.prototype.$baseUrl = 'http://facepay.huasunsolar.com/web_interface/';
// Vue.prototype.$baseUrl = 'http://218.23.218.228:8018/web_interface/'
-Vue.prototype.$store = store;
-
+Vue.use(uView)
+Vue.component('Tabbar', Tabbar)
+Vue.component('navigation', navigation)
+Vue.prototype.$store = store
+Vue.prototype.$jump = (url) => {
+ uni.navigateTo({
+ url
+ })
+}
+Vue.prototype.$onWait = new Promise((resolve) => {
+ Vue.prototype.$reslove = resolve
+})
App.mpType = 'app'
-Vue.use(uView)
const app = new Vue({
- store,
+ store,
...App
})
// http鎺ュ彛API鎶界
import httpApi from '@/utils/http.api.js'
+import httpMeetingApi from '@/utils/meetingHttp.js'
Vue.use(httpApi, app)
+Vue.use(httpMeetingApi, app)
// 璇锋眰鎷︽埅鍣�
import interceptor from '@/utils/http.interceptor.js'
--
Gitblit v1.9.3