💄界面优化

src/assets/styles/login.scss

@@ -16,7 +16,7 @@
     border-radius: 6px;
     width: var(--base-login-width);
     position: relative;
-    height: 420px;
+    // height: 420px;
   }
 }
 
@@ -29,7 +29,7 @@
 .login-form {
   padding: 5px 25px 5px 25px;
   position: relative;
-  // height: 250px;
+  height: 230px;
 
   .input-icon {
     height: 30px;

src/assets/styles/variables.module.scss

@@ -21,6 +21,9 @@ $panGreen: #30b08f;
   --base-header-height: 50px;
   //登录框宽度
   --base-login-width: 360px;
+
+  // 侧边栏图标大小
+  --el-menu-icon-width: 14px;
 }
 
 /***侧边栏深色配置***/

src/views/login.vue

@@ -63,7 +63,7 @@
       </div>
 
       <phoneLogin v-show="loginType == 2"></phoneLogin>
-      <oauthLogin></oauthLogin>
+      <oauthLogin v-show="defaultSettings.showOtherLogin"></oauthLogin>
     </div>
 
     <div class="el-login-footer">

src/views/system/user/index.vue

@@ -110,9 +110,16 @@
             prop="phonenumber"
             v-if="columns.showColumn('phonenumber')"
             width="120" />
-          <el-table-column label="状态" align="center" key="status" v-if="columns.showColumn('status')">
+          <el-table-column label="启用" align="center" key="status" v-if="columns.showColumn('status')">
             <template #default="scope">
-              <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+              <el-switch
+                v-model="scope.row.status"
+                :active-value="0"
+                :inactive-value="1"
+                active-text="是"
+                inactive-text="否"
+                inline-prompt
+                @change="handleStatusChange(scope.row)"></el-switch>
             </template>
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns.showColumn('createTime')" width="160"></el-table-column>
@@ -121,7 +128,7 @@
               <dict-tag :options="sexOptions" :value="scope.row.sex" />
             </template>
           </el-table-column>
-          <el-table-column prop="avatar" label="头像地址" align="center" v-if="columns.showColumn('avatar')">
+          <el-table-column prop="avatar" label="头像" align="center" v-if="columns.showColumn('avatar')">
             <template #default="scope">
               <el-image
                 preview-teleported
@@ -334,9 +341,9 @@ const columns = ref([
   { key: 3, label: `部门`, visible: true, prop: 'deptName' },
   { key: 4, label: `手机号码`, visible: true, prop: 'phonenumber' },
   { key: 5, label: `状态`, visible: true, prop: 'status' },
-  { key: 6, label: `创建时间`, visible: true, prop: 'createTime' },
-  { key: 7, label: `性别`, visible: false, prop: 'sex' },
-  { key: 8, label: `头像`, visible: false, prop: 'avatar' },
+  { key: 6, label: `创建时间`, visible: false, prop: 'createTime' },
+  { key: 7, label: `性别`, visible: true, prop: 'sex' },
+  { key: 8, label: `头像`, visible: true, prop: 'avatar' },
   { key: 9, label: `邮箱`, visible: false, prop: 'email' },
   { key: 10, label: `最后登录时间`, visible: false, prop: 'loginDate' }
 ])

src/views/system/user/profile/userInfo.vue

@@ -15,10 +15,10 @@
         <el-radio :label="1">{{ $t('common.female') }}</el-radio>
       </el-radio-group>
     </el-form-item>
-    <el-form-item>
-      <el-button type="primary" icon="Check" @click="submit">{{ $t('btn.save') }}</el-button>
+    <div style="margin-left: 40px">
       <el-button type="danger" icon="Close" @click="close">{{ $t('btn.close') }}</el-button>
-    </el-form-item>
+      <el-button type="primary" icon="Check" @click="submit">{{ $t('btn.save') }}</el-button>
+    </div>
   </el-form>
 </template>
 
@@ -27,8 +27,8 @@ import { updateUserProfile } from '@/api/system/user'
 
 const props = defineProps({
   user: {
-    type: Object,
-  },
+    type: Object
+  }
 })
 
 const { proxy } = getCurrentInstance()
@@ -40,17 +40,17 @@ const rules = ref({
     {
       type: 'email',
       message: "'请输入正确的邮箱地址",
-      trigger: ['blur', 'change'],
-    },
+      trigger: ['blur', 'change']
+    }
   ],
   phonenumber: [
     { required: true, message: '手机号码不能为空', trigger: 'blur' },
     {
       pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
       message: '请输入正确的手机号码',
-      trigger: 'blur',
-    },
-  ],
+      trigger: 'blur'
+    }
+  ]
 })
 
 /** 提交按钮 */