Merge remote-tracking branch 'origin/20210819' into yuanfeng

8dd15c5d · yuanfeng · e219957a · 33ac272d · 8dd15c5d · 8dd15c5d
Commit 8dd15c5d authored Aug 17, 2021 by yuanfeng
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

index.html index.html +1 -1

index.vue src/components/Header/index.vue +1 -1

Center.vue src/pages/index/Center.vue +2 -1

index.vue src/pages/index/index.vue +1 -1

No files found.
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>张謇教育</title>
+    <title>张謇企业家学院管理平台</title>
 </head>
 <body>
    <div id="app"></div>

--- a/src/components/Header/index.vue
+++ b/src/components/Header/index.vue
@@ -22,7 +22,7 @@ export default {
    props: {
        title: {
            type: String,
-            default: '徐汇区教师队伍整体发展情况分析'
+            default: ''
        }
    },


--- a/src/pages/index/Center.vue
+++ b/src/pages/index/Center.vue
@@ -13,7 +13,7 @@
            <div class="item course">
                <title-line :con="'发展历程'"></title-line>
                <div class="courseModal">
-                    2021年1月6日成立
+                    2021年1月6日成立<br />
                    全省民营企业家学习弘扬张謇
                    精神高级研修班同日开班
                </div>
@@ -244,6 +244,7 @@ export default {
            padding: 10px 15px;
            display: flex;
            justify-content: space-between;
+            box-sizing: border-box;
            .item {
                width: 50%;
                height: 100%;

--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
 <template>
    <div class="index-page">
        <layout :layoutConf="layoutSize">
-            <page-head title="张謇教育基地管理平台" slot="header" />
+            <page-head title="张謇企业家学院管理平台" slot="header" />
            <template v-if="fetchSuccess">
                <!-- left -->
                <left :leftData="leftData" slot="left" />