Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

13 小时以前 d35afc038576e0d611f30fbe7cffe891a3e933d5

Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

 admin/.env.development

@@ -5,9 +5,9 @@

#VUE_APP_API_URL  = 'http://192.168.1.45:10010'

#VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'
VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'

VUE_APP_API_URL  = 'http://localhost:10010'
#VUE_APP_API_URL  = 'http://localhost:10010'

#key：045542fc5f436b75e6c911c5c84ff8cd
#密钥：8bd38497f9aee2b75e7a888a4dfd1e6c

 admin/src/components/common/CommonHeader.vue

@@ -379,7 +379,7 @@
    box-sizing: border-box;
    min-width: 360px;
    height: 56px;
    padding: 10px 20px;
    padding: 10px 12px;
    // flex-shrink: 0;
    line-height: 36px;
    font-size: 22px;
@@ -484,8 +484,8 @@
        align-items: center;
        img {
            top: 0 !important;
            width: 20px;
            height: 20px;
            width: 18px;
            height: 18px;
            margin-right: 12px;
        }
    }