Merge branch 'master' of http://192.168.0.105:10010/r/school-web

liuyg

2021-12-22 75ca0722b86e7751202e7aec2e8d8ef96d68ce98

 src/components/campusNav/index.vue

@@ -6,7 +6,7 @@
             :class="{'move': moveFlag}">
            <div class="title">
                <img class="icon deblurring"
                     src="/img/icon/jg.png"
                     src="/img/icon/xndh.png"
                     alt="">
                <span>
                    校内导航
@@ -51,7 +51,7 @@
                </div>
                <div>
                    <el-button @click="startNavigation"
                               type="danger">导航</el-button>
                               type="primary">导航</el-button>
                </div>
            </div>
        </div>
@@ -258,7 +258,7 @@
        width: 100%;
        height: 36px;
        line-height: 36px;
        background-color: #020c17;
        background-color: #2196f3;

        .title {
            padding-left: 10px;
@@ -286,6 +286,7 @@
            margin: auto;
            width: 14px;
            height: 14px;
            cursor: pointer;
        }
    }