Merge remote-tracking branch 'origin/master'

.env.development

 VUE_APP_CURRENTMODE = "development"
-VUE_APP_HOST_URL = "https://icommunity.thed3chain.com:5443"
+VUE_APP_HOST_URL = "http://81.68.189.225:9091"
 VUE_APP_LOG = true
\ No newline at end of file

src/assets/css/_reset.css

@@ -8,6 +8,10 @@
   font-family: 'PingFangSC-Medium'; 
   src: url('../font/PingFangSC-Medium.ttf');
 }
+@font-face {
+  font-family: 'PingFangSC-Semibold'; 
+  src: url('../font/PingFangSC-Semibold.otf');
+}
 
 html,
 body,

src/components/layout/footer.vue

@@ -99,6 +99,9 @@ export default {
     flex-wrap: wrap;
     div{
       margin-right: 20px;
+      color: #0E2C6B;
+      font-size: 14px;
+      font-family: PingFangSC-Regular, PingFang SC;
       &:last-child{
         margin-right: 0;
       }
@@ -109,6 +112,7 @@ export default {
       line-height: 30px;
       color: #0E2C6B;
       font-size: 14px;
+      font-family: PingFangSC-Regular, PingFang SC;
     }
   }
   .qrcode {

src/views/Org/Branch.vue

@@ -173,6 +173,7 @@ export default {
   .cate-name {
     color: #454545;
     font-size: 18px;
+    font-family: PingFangSC-Medium, PingFang SC;
   }
   .alert {
     margin: 30px 0 20px 0;
@@ -191,10 +192,13 @@ export default {
       color: #454545;
       padding-left: 30px;
       padding-right: 30px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-size: 15px;
       &.active,
       &:hover {
         border-bottom: 3px solid #f26335;
         color: #04408d;
+        font-family: PingFangSC-Semibold, PingFang SC;
       }
     }
   }

src/views/Org/comps/fzzx.vue

@@ -41,6 +41,7 @@ export default {
   font-size: 14px;
   .cate-name {
     color: #454545;
+    font-family: PingFangSC-Medium, PingFang SC;
   }
   .fzzx-list {
     margin-top: 20px;

src/views/comps/left.vue

@@ -82,6 +82,8 @@ export default {
       border: 0;
       font-size: 14px;
       padding: 0.8rem 1rem;
+      color: #666666;
+      font-family: PingFangSC-Regular, PingFang SC;
       &.active {
         background: rgba(242, 99, 53, 0.1);
         color: #f26335;