From c9928dd4f6d25e2339ea1400f59ec58674a927a7 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 20:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
main.js | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/main.js b/main.js
index aa20e0e..f8ed343 100644
--- a/main.js
+++ b/main.js
@@ -1,11 +1,16 @@
import Vue from "vue";
import App from "./App";
import * as filters from "./utils/filters.js"; // global filter
-import uView from "uview-ui";
+import uView from '@/components/uview-components/uview-ui'
import store from "./store";
import config from '@/config/config';
import airBtn from "@/components/m-airbtn/index.vue";
import socketIO from './pages/mine/im/socket';
+
+// 鑷畾涔塼abbar
+import CustomTabbar from '@/components/custom-tabbar.vue'
+Vue.component('custom-tabbar', CustomTabbar)
+
/**
* 浠呭湪h5涓樉绀哄敜閱抋pp鍔熻兘
* 鍦╤5椤甸潰鎵嬪姩鎸傝浇
@@ -19,7 +24,7 @@
// #endif
// 寮曞叆uView瀵瑰皬绋嬪簭鍒嗕韩鐨刴ixin灏佽
-let mpShare = require('uview-ui/libs/mixin/mpShare.js');
+let mpShare = require('./components/uview-components/uview-ui/libs/mixin/mpShare.js');
Vue.mixin(mpShare)
/**
@@ -30,6 +35,7 @@
Vue.filter(key, filters[key]);
});
+console.log("鏈夊悧锛�",uView);
// 寮曞叆Vuex
Vue.prototype.$store = store;
// Vue.prototype.socketIo = new socketIO();
--
Gitblit v1.8.0