缴费，案件详情问题处理

src/main.js

@@ -4,7 +4,7 @@ import Cookies from 'js-cookie'
 
 import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
-
+import './assets/icons' // icon
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
 import App from './App'
@@ -13,6 +13,7 @@ import router from './router'
 import directive from './directive' // directive
 import plugins from './plugins' // plugins
 import { download } from '@/utils/request'
+<<<<<<< HEAD
 import { Message } from 'element-ui'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
@@ -22,6 +23,11 @@ import './assets/icons' // icon
 // 引入Iconfont 矢量图标库
 import './assets/icon/iconfont.css'
 // import './permission' // permission control
+=======
+
+import './assets/icon/iconfont.css'
+import './permission' // permission control
+>>>>>>> 0ca62df (缴费，案件详情问题处理)
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";