Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

shuishen

2022-09-28 4254d7dde3834496c38a40a317af1fd8858f076a

Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

 public/favicon.ico

 public/img/favicon1.ico

 public/img/favicon1.jpg

 public/img/icon.png

 src/views/activity/index.vue

@@ -693,6 +693,7 @@
                button:active {
                    background-color: rgb(0, 92, 169);
                    border: 1px solid rgb(0, 92, 169);
                    color: rgb(189, 185, 185) !important;
                }
            }
        }

 src/views/lyout/index.vue

@@ -11,9 +11,10 @@
<template>
    <div class="wrapper">
        <div class="main-header">
            <!-- <div class="title">社区警务平台</div> -->
            <!-- <div class="title"></div> -->
            <div class="title">
                <img src="../../../public/img/logo.png" />
                <img src="../../../public/img/icon.png" />
                <h3>社区警务平台</h3>
            </div>

            <!-- 菜单导航 -->
@@ -128,13 +129,18 @@
        z-index: 99;

        .title {
            width: 400px;
            text-align: center;
            display: flex;
            align-items: center;
            width: 450px;
            font-size: 38px;
            // text-align: center;
            overflow: hidden;
            letter-spacing: 6px;
            & > img {
                // width: 100%;
                height: 120%;
                margin-top: -5px;
                height: 80%;
                margin: 0 10px 0 10px;
                // margin-top: -5px;
            }
        }