主分支代码合并

src/components/newLayout/modules/header.vue

@@ -17,16 +17,16 @@
       <p>{{weather.daily?weather.daily[0].low:""}}℃ ~ {{weather.daily?weather.daily[0].high:""}}℃</p>
     </div> -->
     <!-- 语言   -->
-    <el-dropdown @command="handleCommand">
+<!--    <el-dropdown @command="handleCommand">
       <span class="el-dropdown-link" style="color: #FFF;">
-        语言<i class="el-icon-arrow-down el-icon--right"></i>
+        语言<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>
       </span>
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item v-for="item in langusge" :key="item.index" :command="item.languagecode">{{item.languagename}}</el-dropdown-item>
       </el-dropdown-menu>
-    </el-dropdown>
+    </el-dropdown>-->
+<!--    <el-divider direction="vertical"></el-divider>-->
 
-    <el-divider direction="vertical"></el-divider>
     <el-dropdown>
       <span class="el-dropdown-link">
         <div class="flex">