From f4100156dd7083d5383e9161ce41c0c145cbada8 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 19 Dec 2024 13:44:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E4=BB=A3=E7=A0=81=E5=A2=9E=E5=8A=A0;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gulpfile.js                | 34 +++++++++++++++++-----------------
 src/views/common/login.vue |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index f1a8ee2..adbcc1b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,27 +1,27 @@
-var gulp = require('gulp')
-var $ = require('gulp-load-plugins')()
-var path = require('path')
-var del = require('del')
+var gulp = require('gulp');
+var $ = require('gulp-load-plugins')();
+var path = require('path');
+var del = require('del');
 
-var distPath = path.resolve('./dist')
-var version = '' // 版本号
-var versionPath = '' // 版本号路径
+var distPath = path.resolve('./dist');
+var version = '' ;// 版本号
+var versionPath = '' ;// 版本号路径
 var env = ''; // 运行环境
 
 // 创建版本号(年月日时分)
 (function () {
-	var d = new Date()
-	var yy = d.getFullYear().toString().slice(2)
-	var MM = d.getMonth() + 1 >= 10 ? (d.getMonth() + 1) : '0' + (d.getMonth() + 1)
-	var DD = d.getDate() >= 10 ? d.getDate() : '0' + d.getDate()
-	var h = d.getHours() >= 10 ? d.getHours() : '0' + d.getHours()
-	var mm = d.getMinutes() >= 10 ? d.getMinutes() : '0' + d.getMinutes()
-	version = yy + MM + DD + h + mm
-	versionPath = distPath + '/' + version
-})()
+	var d = new Date();
+	var yy = d.getFullYear().toString().slice(2);
+	var MM = d.getMonth() + 1 >= 10 ? (d.getMonth() + 1) : '0' + (d.getMonth() + 1);
+	var DD = d.getDate() >= 10 ? d.getDate() : '0' + d.getDate();
+	var h = d.getHours() >= 10 ? d.getHours() : '0' + d.getHours();
+	var mm = d.getMinutes() >= 10 ? d.getMinutes() : '0' + d.getMinutes();
+	version = yy + MM + DD + h + mm;
+	versionPath = distPath + '/' + version;
+})();
 
 // 编译
-gulp.task('build', $.shell.task(['node build/build.js']))
+gulp.task('build', $.shell.task(['node build/build.js']));
 
 // 创建版本号目录
 gulp.task('create:versionCatalog', gulp.series('build', function () {
diff --git a/src/views/common/login.vue b/src/views/common/login.vue
index 0437719..116107f 100644
--- a/src/views/common/login.vue
+++ b/src/views/common/login.vue
@@ -260,7 +260,7 @@ export default {
             url: this.$http.adornUrl("sys/login"),
             method: "post",
             data: this.$http.adornData({
-              userName: this.dataForm.userName,
+              username: this.dataForm.userName,
               password: this.dataForm.password,
               uuid: this.dataForm.uuid,
               captcha: this.dataForm.captcha,