Merge branch 'master' of http://git.lgzn.space/lixiaobang/YingYeTing

src/App.vue

@@ -12,9 +12,19 @@
         </div>
       </div>
       <div class="topCenter">
-        国网南京雨花供电营业厅
+        <div class="topText">
+          <img src="./assets/images/topText.png"/>
+        </div>
+        
+      </div>
+      <div class="topRight">
+        <div>
+          天气&nbsp;:&nbsp;
+          <img src="./assets/weather/sun.png"/>
+          多云
+        </div>
+        <div style="color:rgb(57,173,194)">|&nbsp;&nbsp;5~25℃</div>
       </div>
-      <div class="topRight"></div>
     </div>
     <div class="main">
       <router-view /> 
@@ -52,7 +62,7 @@ export default {
   width: 100%;
   height: 8.6%;
   display: flex;
-  justify-content: space-between;
+  jjustify-content: space-evenly;
   .topLeft{
     width: 11%;
     height: 55%;
@@ -68,11 +78,22 @@ export default {
     height: 100%;
     background: url("./assets/images/topBg.png") no-repeat;
     background-size: 100% 100%;
+    display: flex;
+    justify-content: center;
+    .topText{
+      height: 65%;
+      display: flex;
+      align-items: center;
+    }
   }
   .topRight{
-    width: 11%;
+    width: 12%;
-    height: 100%;
+    height: 50%;
-    border: 1px solid blue;
+    color:#ffffff;
+    display: flex;
+    justify-content: space-evenly;
+    align-items: center;
+    color: #fff;
   }
 }
 .main{