Merge remote-tracking branch 'origin/dev' into dev

Author: lbw

src/config/env.js

@@ -3,13 +3,11 @@
 const env = process.env
 const baseUrl = ''
 // 图表库为avue和pig2套地址
-const iconfontVersion = ['567566_qo5lxgtishg', '667895_v7uduh4zui']
-const iconfontUrl = `//at.alicdn.com/t/font_$key.css`
+const iconfontVersion = ['//at.alicdn.com/t/font_567566_qo5lxgtishg.css', '//at.alicdn.com/t/font_667895_v7uduh4zui.css']
 const codeUrl = `${window.location.origin}/code`
 
 export {
   baseUrl,
-  iconfontUrl,
   iconfontVersion,
   codeUrl,
   env

src/const/crud/admin/post.js

@@ -43,7 +43,7 @@ export const tableOption = {
       "label": "岗位排序",
       "prop": "postSort",
       "hide":true,
-      span:6
+      span: 8
     },
     {
       "type": "input",

src/main.js

@@ -17,7 +17,7 @@ import store from "./store";
 import { loadStyle, downBlobFile } from "@/util/util";
 import { validatenull } from "@/util/validate";
 import * as urls from "@/config/env";
-import { iconfontUrl, iconfontVersion } from "@/config/env";
+import { iconfontVersion } from "@/config/env";
 import * as filters from "./filters"; // 全局filter
 import "./styles/common.scss";
 import basicContainer from "./components/basic-container/main";
@@ -67,8 +67,7 @@ Object.keys(filters).forEach(key => {
 
 // 动态加载阿里云字体库
 iconfontVersion.forEach(ele => {
-  console.log(iconfontUrl.replace("$key", ele));
-  loadStyle(iconfontUrl.replace("$key", ele));
+  loadStyle(ele);
 });
 
 Vue.config.productionTip = false;