feat:恢复 冲突

This commit is contained in:
wangjiahao 2021-03-25 19:19:21 +08:00
parent 0a75df5838
commit 2ce81bba8c

View File

@ -14,6 +14,7 @@ import '@/permission' // permission control
import api from '@/api/index.js'
import filter from '@/filter/filter'
import directives from './directive'
import VueClipboard from 'vue-clipboard2'
import '@/custom-component' // 注册自定义组件
import '@/assets/iconfont/iconfont.css'
@ -21,7 +22,7 @@ import '@/styles/animate.css'
import 'element-ui/lib/theme-chalk/index.css'
import '@/styles/reset.css'
Vue.config.productionTip = false
Vue.use(VueClipboard)
Vue.prototype.$api = api