From f18ff6df94830a0147f372f031fa94ab5402ead8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 18 三月 2024 15:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/login.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index a63965f..e604abf 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -41,7 +41,7 @@
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
       </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">璁颁綇瀵嗙爜</el-checkbox>
+      <el-checkbox v-model="loginForm.rememberMe" style=" margin:0px 0px 25px 0px;">璁颁綇瀵嗙爜</el-checkbox>
       <el-form-item style="width:100%;">
         <el-button
           :loading="loading"
@@ -59,7 +59,7 @@
       </el-form-item>
     </el-form>
 
-    <el-dialog title="涓轰簡鎮ㄧ殑璐﹀彿瀹夊叏,棣栨鐧婚檰璇蜂慨鏀瑰瘑鐮�" :visible.sync="loginInfo.firstLogin==0?true:false">
+    <el-dialog title="涓轰簡鎮ㄧ殑璐﹀彿瀹夊叏,棣栨鐧婚檰璇蜂慨鏀瑰瘑鐮�" :visible.sync="loginInfo.firstLogin==0">
          <el-form>
            <el-form-item label="鏂板瘑鐮�">
                <el-input v-model="newPassword" autocomplete="off"></el-input>

--
Gitblit v1.8.0