v2.5.0

GQA-BACKEND/api/public/login.go

@@ -18,8 +18,8 @@ func (a *ApiLogin) Login(c *gin.Context) {
 	if global.Store.Verify(l.CaptchaId, l.Captcha, true) {
 		u := &model.SysUser{Username: l.Username, Password: l.Password}
 		if err, user := servicePublic.ServiceLogin.Login(u); err != nil {
-			global.GqaLogger.Error(l.Username+" 登录失败，用户名或密码错误！", zap.Any("err", err))
-			model.ResponseErrorMessage("用户名或密码错误，"+err.Error(), c)
+			global.GqaLogger.Error(l.Username + "登录失败，用户名或密码错误！")
+			model.ResponseErrorMessage("用户名或密码错误", c)
 			if err = servicePublic.ServiceLogin.LogLogin(l.Username, c, "yesNo_no", "登录失败，用户名或密码错误！"); err != nil {
 				global.GqaLogger.Error("登录日志记录错误！", zap.Any("err", err))
 			}

GQA-FRONTEND/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gin-quasar-admin",
-    "version": "v2.4.2",
+    "version": "v2.5.0",
     "description": "gin-quasar-admin",
     "productName": "gin-quasar-admin",
     "author": "Junvary <[email protected]>",
@@ -11,7 +11,7 @@
         "test": "echo \"No test specified\" && exit 0"
     },
     "dependencies": {
-        "@quasar/extras": "^1.15.5",
+        "@quasar/extras": "^1.15.6",
         "axios": "^0.21.1",
         "core-js": "^3.6.5",
         "echarts": "^5.3.2",
@@ -47,4 +47,4 @@
         "npm": ">= 6.13.4",
         "yarn": ">= 1.21.1"
     }
-}
+}

GQA-FRONTEND/src/composables/useTheme.js

@@ -13,7 +13,7 @@ export default function useTheme() {
             return 'bg-dark text-white'
         } else {
             if (themeStyle.value === 'Gin-Quasar-Admin') {
-                return 'bg-blue-grey-9 text-white'
+                return 'bg-grey-10 text-white'
             }
             if (themeStyle.value === 'Quasar') {
                 return 'bg-primary text-white'
@@ -82,10 +82,10 @@ export default function useTheme() {
     });
     const darkThemeSideBar = computed(() => {
         if ($q.dark.isActive) {
-            return ['class', 'bg-dark text-white']
+            return ['class', 'bg-grey-10 text-white']
         } else {
             if (themeStyle.value === 'Gin-Quasar-Admin') {
-                return ['class', 'bg-blue-grey-9 text-white']
+                return ['class', 'bg-grey-3 text-grey-10']
             }
             if (themeStyle.value === 'Quasar') {
                 return ['class', 'bg-white text-dark']
@@ -100,10 +100,10 @@ export default function useTheme() {
     })
     const darkThemeSelect = computed(() => {
         if ($q.dark.isActive) {
-            return 'bg-blue-grey-9 text-white'
+            return 'bg-grey-10 text-white'
         } else {
             if (themeStyle.value === 'Gin-Quasar-Admin') {
-                return 'bg-primary text-white'
+                return 'bg-grey-5 text-grey-10'
             }
             if (themeStyle.value === 'Quasar') {
                 return 'bg-primary text-white'

GQA-FRONTEND/src/layouts/LoginLayout/LoginForm.vue

@@ -11,17 +11,17 @@
                 {{ $t('WelcomeBack') }}
             </div>
             <q-form @submit="onSubmit" class="q-mt-lg gqa-form">
-                <q-input :disable="loading" outlined dense no-error-icon v-model.trim="form.username"
+                <q-input :disable="loading" outlined dense no-error-icon v-model.trim="form.username" rounded color="black"
                     :placeholder="$t('Username')" :rules="[(val) => (val && val.length > 0) || $t('NeedInput')]" />
                 <q-input :disable="loading" outlined dense no-error-icon :type="isPwd ? 'password' : 'text'"
-                    v-model.trim="form.password" :placeholder="$t('Password')"
+                    v-model.trim="form.password" :placeholder="$t('Password')"  rounded color="black"
                     :rules="[(val) => (val && val.length > 0) || $t('NeedInput')]">
                     <template v-slot:append>
                         <q-icon :name="isPwd ? 'visibility_off' : 'visibility'" class="cursor-pointer"
                             @click="isPwd = !isPwd" />
                     </template>
                 </q-input>
-                <q-input :disable="loading" outlined dense no-error-icon v-model.trim="form.captcha"
+                <q-input :disable="loading" outlined dense no-error-icon v-model.trim="form.captcha" rounded color="black"
                     :placeholder="$t('Captcha')" :rules="[(val) => (val && val.length > 0) || $t('NeedInput')]">
                     <template v-slot:after>
                         <q-btn padding="none" style="width: 120px; height: 100%" @click="getCaptcha">
@@ -34,7 +34,7 @@
                         @update:model-value="changeRememberMe" />
                 </div>
                 <div class="items-center justify-around q-mt-md row">
-                    <q-btn :label="$t('Login')" type="submit" color="primary" :loading="loading" style="width: 100%" />
+                    <q-btn rounded glossy :label="$t('Login')" type="submit" color="primary" :loading="loading" style="width: 100%" />
                 </div>
             </q-form>
             <q-inner-loading :showing="loading" style="background-color: rgba(0, 0, 0, 0);">

GQA-FRONTEND/src/layouts/MainLayout/index.vue

@@ -43,16 +43,16 @@
             </q-toolbar>
         </q-header>
 
-        <q-drawer bordered v-model="toggleLeftDrawer" show-if-above content-class="bg-grey-1" :width="drawerWidth"
-            :mini="miniState" :mini-to-overlay="miniStateOut ? true : false" @mouseover="miniStateMouseover"
+        <q-drawer bordered v-model="toggleLeftDrawer" show-if-above :width="drawerWidth" :mini="miniState"
+            :mini-to-overlay="miniStateOut ? true : false" @mouseover="miniStateMouseover"
             @mouseout="miniStateMouseout">
             <SideBarLeft :topMenuChildren="topMenuChildren">
                 <q-select v-if="layoutView.split(' ')[0] === 'lHh'" id="menuSelect" v-model="currentTopMenu"
-                    :options="topMenu" map-options option-value="name" @update:model-value="changeTop"
-                    :dark="themeStyle === 'Quasar' ? false : true" borderless
+                    :options="topMenu" map-options option-value="name" @update:model-value="changeTop" filled
+                    :dark="(themeStyle === 'Gin-Quasar-Admin' || themeStyle === 'Quasar') ? false : true" borderless
                     :option-label="opt => Object(opt) === opt && 'title' in opt ? $t(opt.title) : opt.title">
                     <template v-slot:prepend>
-                        <q-icon name="ion-md-apps" style="margin-left: 12px;" size="30px" />
+                        <q-icon name="ion-md-apps" style="margin-right: 17px;" size="30px" />
                     </template>
                 </q-select>
             </SideBarLeft>

GQA-FRONTEND/yarn.lock

@@ -1186,10 +1186,10 @@
     core-js "^3.6.5"
     core-js-compat "^3.6.5"
 
-"@quasar/extras@^1.15.5":
-  version "1.15.5"
-  resolved "https://registry.yarnpkg.com/@quasar/extras/-/extras-1.15.5.tgz#da427761c1c643c2cbe9dfa656817da54acb5686"
-  integrity sha512-JzKKx5/eKAip3X3bZUEJOOWT9NudqjF01gcce6rtyviko49OU4r+ekyJU3QQIKF8ZqnjZ+DpsVpMWBBZnO6hSQ==
+"@quasar/extras@^1.15.6":
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/@quasar/extras/-/extras-1.15.6.tgz#0bbcd0df9d403355cf7c82a4f3d287f4e1e98b7c"
+  integrity sha512-lG3wrcz47c86N/j1ULZugmyVfwpmnsJpjtSWh+LhaFfe0g1kTMdAnxkWGKsa3ouZ4QBcnkrNan0kYSnKc3MiBg==
 
 "@quasar/[email protected]":
   version "1.1.5"