Merge remote-tracking branch 'origin/master'

zss

2023-12-07 95cafbee8f05dc6fbc6256c5cd84bcfe3621107f

 src/page/index/logo.vue

@@ -11,7 +11,7 @@
            style="width: 220px;"
            src="/images/Sun-Mes-Logo-Normal.png"
        /></span>-->
        <div key="1" style="width:220px;height:60px;background-color:#875a7b;position: relative;">
        <div key="2" style="width:220px;height:60px;background-color:#875a7b;position: relative;">
          <!-- <el-image
            v-if="logSrc != null"
            style="width:200px;position: absolute;"
@@ -120,7 +120,7 @@
  width: 220px;
  height: 64px;
  line-height: 64px;
  background-color: #006eff;
  background-color: #875a7b;
  font-size: 20px;
  overflow: hidden;
  box-sizing: border-box;
@@ -151,7 +151,7 @@
    width: 220px;
    height: 64px;
    line-height: 64px;
    background-color: #006eff;
    background-color: #875a7b;
    font-size: 20px;
    overflow: hidden;
    box-sizing: border-box;