Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -197,6 +197,7 @@ export default {
       color: #fff;
       text-indent: 6px;
       letter-spacing: 2px;
+      font-family: albbsht;
     }
   }
 

-@import './variables.scss';
-@import './mixin.scss';
-@import './transition.scss';
-@import './element-ui.scss';
-@import './sidebar.scss';
-@import './btn.scss';
+@import "./variables.scss";
+@import "./mixin.scss";
+@import "./transition.scss";
+@import "./element-ui.scss";
+@import "./sidebar.scss";
+@import "./btn.scss";
+
+// 字体
+@font-face {
+  font-family: "albbsht";
+  font-weight: 200;
+  src: url("./AlimamaShuHeiTi-Bold.ttf");
+  /* src: url("//at.alicdn.com/wf/webfont/ZU6UneTxNcLy/v9AokMyfgvHu.woff2") format("woff2"),
+  url("//at.alicdn.com/wf/webfont/ZU6UneTxNcLy/paYiW177n7Bc.woff") format("woff"); */
+  font-display: swap;
+}
 
 /* CSS 初始化 */
 html,
@@ -85,7 +95,8 @@ body {
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
+    Microsoft YaHei, Arial, sans-serif;
 }
 
 html {
@@ -161,7 +172,7 @@ div:focus {
 }
 
 .move {
-  color: #409EFF;
+  color: #409eff;
   font-size: 24px;
 }
 
@@ -192,7 +203,8 @@ aside {
   display: block;
   line-height: 32px;
   font-size: 16px;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
+    Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
   color: #2c3e50;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
@@ -251,7 +263,7 @@ aside {
 }
 
 .text-center {
-  text-align: center
+  text-align: center;
 }
 
 .width100 {
@@ -266,7 +278,13 @@ aside {
   text-align: right;
   padding-right: 20px;
   transition: 600ms ease position;
-  background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
+  background: linear-gradient(
+    90deg,
+    rgba(32, 182, 249, 1) 0%,
+    rgba(32, 182, 249, 1) 0%,
+    rgba(33, 120, 241, 1) 100%,
+    rgba(33, 120, 241, 1) 100%
+  );
 
   .subtitle {
     font-size: 20px;
@@ -314,17 +332,16 @@ aside {
 .delete-button {
   line-height: 32px;
   cursor: pointer;
-  color: #FF7115;
+  color: #ff7115;
   font-size: 20px;
   margin-right: 5px;
-
 }
 
 .add-button {
   line-height: 32px;
-  color: #2FA5FF;
+  color: #2fa5ff;
   cursor: pointer;
-  font-size: 20PX;
+  font-size: 20px;
 }
 
 .description {
@@ -352,13 +369,13 @@ aside {
 .disabled {
   color: #87adf3;
   background-color: #fff;
-  cursor: not-allowed
+  cursor: not-allowed;
 }
 
 .bad {
   color: #f00;
   background-color: #fff;
-  cursor: not-allowed
+  cursor: not-allowed;
 }
 
 .allow,
@@ -382,7 +399,7 @@ aside {
 }
 
 .suspend::before {
-  content: '';
+  content: "";
   position: absolute;
   left: 5px;
   top: 45%;
@@ -424,7 +441,6 @@ aside {
   }
 }
 
-
 .linshiIcon {
   position: relative;
 
@@ -474,7 +490,7 @@ aside {
   height: 0;
   border-width: 0px 0px 55px 55px;
   border-style: none solid solid;
-  border-color: transparent transparent #67C23A;
+  border-color: transparent transparent #67c23a;
   position: absolute;
   top: 0;
   right: 0;