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

liuyg

2022-01-08 5e47738f99e307bab1c8a5ee9ecd96d8c7f4a968

 src/components/map/components/campusBuildingSearch.vue

@@ -3,7 +3,7 @@
        <div class="map-campus-search"
             id="CampusSearchPanel">
            <el-input class="search-input"
                      placeholder="校园搜索…"
                      placeholder="社区搜索…"
                      v-model="searchInput"
                      @input="searchValueChange"
                      @focus="shortcutFlag = true">
@@ -81,14 +81,14 @@
                },
                {
                    bgimg: '/img/search/venue.png',
                    title: '校内场馆',
                    title: '社区场馆',
                    type: 'arc',
                    path: '/pcLayout/default/arc/venue',
                    code: 3
                },
                {
                    bgimg: '/img/search/dorm.png',
                    title: '学生宿舍',
                    title: '社区宿舍',
                    type: 'arc',
                    path: '/pcLayout/default/arc/dorm',
                    code: 4
@@ -110,7 +110,7 @@
    computed: {
        ...mapGetters([
            'viewer',
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'campusNavFlag',
            'orgNavBarFlag',
            'arcNavBarFlag'