Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/supermarkpp into master

src/style/home.scss

@@ -16,7 +16,7 @@ $height: 64px;
     padding: 0 24px;
     border-bottom:1px solid #fff;
 	font-size: 20px;
-	padding-left: 180px;
+	// padding-left: 180px;
 	img{
 		position: absolute;
 		left: 10px;

src/views/Home.vue

@@ -28,7 +28,7 @@
 						<el-dropdown-item @click.native="changePsw">修改密码</el-dropdown-item>
 					</el-dropdown-menu>
 				</el-dropdown>
-				<img width="128" src="../assets/logo.png" alt="">
+				<!-- <img width="128" src="../assets/logo.png" alt=""> -->
 				<div class="siteTitle">云阅评管理系统</div>
 			</div>
 		</el-header>

src/views/Login.vue

@@ -110,7 +110,7 @@
         <form>
             <div class="input_div">
               <label>账号</label>
-              <input placeholder="" type="text" v-model="logindata.username" placeholder="请输入您的账号" @keyup.enter="login">
+              <input  type="text" v-model="logindata.username" placeholder="请输入您的账号" @keyup.enter="login">
 			  <span class="err">{{tp}}</span>
 			</div>
             <div class="input_div">
@@ -127,7 +127,7 @@
         </form>
       </div>
 		<p class="footer">
-		  Copyright 2016 www.say365.cn,lnc.All rights reserverd <br> 鲁ICP备14000919号-1
+		  Copyright 2024 www.supermark.com,lnc.All rights reserverd <br> 京ICP备XXXXXXXXX号-1
 		</p>
   </div>
 </template>