Pre Merge pull request !407 from zsh/N/A

ruoyi-ui/src/layout/components/Navbar.vue

@@ -34,14 +34,15 @@
           <router-link to="/user/profile">
             <el-dropdown-item>个人中心</el-dropdown-item>
           </router-link>
-          <el-dropdown-item @click.native="setLayout" v-if="setting">
-            <span>布局设置</span>
-          </el-dropdown-item>
           <el-dropdown-item divided @click.native="logout">
             <span>退出登录</span>
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
+
+      <div class="right-menu-item hover-effect setting" @click="setLayout" v-if="setting">
+        <svg-icon icon-class="more-up" />
+      </div>
     </div>
   </div>
 </template>
@@ -177,7 +178,6 @@ export default {
 
       .avatar-wrapper {
         margin-top: 10px;
-        right: 8px;
         position: relative;
 
         .user-avatar {
@@ -190,7 +190,6 @@ export default {
         .user-nickname{
           position: relative;
           bottom: 10px;
-          left: 2px;
           font-size: 14px;
           font-weight: bold;
         }

ruoyi-ui/src/views/system/user/index.vue

@@ -546,11 +546,6 @@ export default {
     },
     // 提交上传文件
     submitFileForm() {
-      const file = this.$refs.upload.uploadFiles
-      if (!file || file.length === 0 || !file[0].name.toLowerCase().endsWith('.xls') && !file[0].name.toLowerCase().endsWith('.xlsx')) {
-        this.$modal.msgError("请选择后缀为 “xls”或“xlsx”的文件。")
-        return
-      }
       this.$refs.upload.submit()
     }
   }