Merge branch 'dev_fix_sub' into user_action

peng

21 小时以前 9653f4faa20699a2d9a03391f4a6175ff8ce59c3

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

// 自定义tabbar