Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # packageRc/api/company/index.js # unpackage/dist/dev/mp-weixin/project.config.json
This commit is contained in:
18
main.js
18
main.js
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Date: 2025-10-23 14:48:48
|
||||
* @LastEditors: shirlwang
|
||||
* @LastEditTime: 2025-10-23 15:02:07
|
||||
* @LastEditTime: 2025-10-31 18:11:22
|
||||
*/
|
||||
import App from './App'
|
||||
import * as Pinia from 'pinia'
|
||||
@@ -18,12 +18,13 @@ import { request, get, post, packageRcRequest, packageRcGet, packageRcPost } fro
|
||||
// 组件
|
||||
import AppLayout from './components/AppLayout/AppLayout.vue';
|
||||
import Empty from './components/empty/empty.vue';
|
||||
import NoBouncePage from './components/NoBouncePage/NoBouncePage.vue'
|
||||
import MsgTips from './components/MsgTips/MsgTips.vue'
|
||||
import SelectPopup from './components/selectPopup/selectPopup.vue'
|
||||
import SelectPopupPlugin from './components/selectPopup/selectPopupPlugin';
|
||||
import RenderJobs from './components/renderJobs/renderJobs.vue';
|
||||
import RenderCompanys from './components/renderCompanys/renderCompanys.vue';
|
||||
import NoBouncePage from '@/components/NoBouncePage/NoBouncePage.vue'
|
||||
import MsgTips from '@/components/MsgTips/MsgTips.vue'
|
||||
import SelectPopup from '@/components/selectPopup/selectPopup.vue'
|
||||
import SelectPopupPlugin from '@/components/selectPopup/selectPopupPlugin';
|
||||
import RenderJobs from '@/components/renderJobs/renderJobs.vue';
|
||||
import RenderCompanys from '@/components/renderCompanys/renderCompanys.vue';
|
||||
// iconfont.css 已在 App.vue 中通过 @import 引入,无需在此处重复引入
|
||||
// import Tabbar from '@/components/tabbar/midell-box.vue'
|
||||
// 自动导入 directives 目录下所有指令
|
||||
const directives = import.meta.glob('./directives/*.js', {
|
||||
@@ -104,12 +105,15 @@ export function createApp() {
|
||||
|
||||
// 先注册Pinia
|
||||
app.use(Pinia.createPinia());
|
||||
// 注册vuex
|
||||
app.use(storeRc);
|
||||
|
||||
// 注册其他插件
|
||||
app.use(SelectPopupPlugin);
|
||||
|
||||
// Vue 3 中挂载全局属性 - 字典获取方法
|
||||
app.config.globalProperties.$getDict = getDict;
|
||||
app.config.globalProperties.$store = storeRc;
|
||||
app.config.globalProperties.$getDictSelectOption = async (dictType, isDigital = false, forceRefresh = false) => {
|
||||
const dictData = await getDict(dictType, forceRefresh);
|
||||
return dictData.map(item => ({
|
||||
|
||||
Reference in New Issue
Block a user