Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_6tc6xtjpla.css');
+@import url('//at.alicdn.com/t/font_2077629_87bihpwi52w.css');
 
 html,
 body,

src/layouts/MainLayout.vue

@@ -270,3 +270,8 @@ export default {
     },
 }
 </script>
+<style>
+    .full-width{
+        height: 100%;
+    }
+</style>

src/router/routes.js

@@ -117,6 +117,16 @@ const routes = [{
         component: () =>
         import("pages/financial/CostType.vue")
       },
+      {
+        path: "/financial/paySetting", //支付配置管理
+        component: () =>
+        import("pages/financial/paySetting.vue")
+      },
+      {
+        path: '/financial/HistoryRateQuery', //历史汇率
+        component: () =>
+        import("pages/financial/HistoryRateQuery.vue")
+      },
       {
         path: "/test", //API测试
         component: () =>