Merge branch 'dev' into dev_fix_sub

peng

2025-07-17 54d46bf0cab4cf31d747e198f1797ea8742e7fe4

 main.js

@@ -4,7 +4,7 @@
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 airBtn from "@/pages/subComponents/m-airbtn/index.vue";
import socketIO from './pages/mine/im/socket';

// 自定义tabbar