Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue

src/assets/loginmini/style/home.less

@@ -323,13 +323,13 @@
 
 .aui-inputClear {
   width: 100%;
-  // border-bottom: 1px solid #cccccc;
+  border: 1px solid #f4f5f9;
   position: relative;
   padding-left: 20px;
   background: #f4f5f9;
-  margin-bottom: 8px;
   margin-top: 20px;
   border-radius: 8px;
+  
 }
 
 .aui-inputClear .icon {
@@ -340,7 +340,7 @@
 
 .aui-inputClear input {
   width: 100%;
-  padding: 10px;
+  padding: 12px;
   border: none;
   color: #333333;
   font-size: 14px;
@@ -368,11 +368,11 @@
 }
 
 .aui-inputClear:focus {
-  border-bottom: 1px solid #1b90ff;
+  border: 1px solid #1b90ff;
 }
 
 .aui-inputClear:hover {
-  border-bottom: 1px solid #1b90ff;
+  border: 1px solid #1b90ff;
 }
 
 .aui-choice {

src/components/Container/src/ScrollContainer.vue

@@ -84,6 +84,7 @@
     .scrollbar__wrap {
       margin-bottom: 18px !important;
       overflow-x: hidden;
+	  padding:0 18px;
     }
 
     .scrollbar__view {

src/components/SimpleMenu/src/SimpleMenu.vue

@@ -202,9 +202,9 @@
 
 .jeecg-menu-light.jeecg-menu-vertical .jeecg-menu-item-active.jeecg-menu-submenu {
   color: #606266 !important;
-  background: #f0f0f0;
+  // background: #f0f0f0;
   padding-bottom: 10px;;
-  
+  border-radius: 6px;
 }
 .jeecg-menu-vertical .jeecg-menu-item, .jeecg-menu-vertical .jeecg-menu-submenu-title {
   position: relative;
@@ -223,7 +223,10 @@
     // margin: 10px 20px 0 20px;
     transform: scale(1.02);
 }
-
+.jeecg-menu-item-active>.jeecg-menu-submenu-title{
+	background: #f0f0f0;
+	border-radius: 6px;
+}
 .ant-drawer-close {
   position: absolute;
   right: 0;
@@ -236,4 +239,16 @@
 //   min-height: 0;
 //   padding: 3px;
 // }
+ 
+ .jeecg-menu-item-active>.jeecg-menu{
+	 margin-top:10px;
+	 background: #FBFBFD;
+	 border-radius: 6px;
+ }
+.jeecg-menu-item-active .jeecg-menu>li{
+	width:80%;
+	margin:5px auto;
+	padding-left:18px !important;
+	
+}
 </style>

src/views/system/loginmini/MiniLogin.vue

@@ -27,16 +27,20 @@
 								</div>
 								<a-divider />
 								<div class="aui-form-box" style="height: 180px">
-                  <a-form ref="loginRef" :model="formData" v-if="activeIndex === 'accountLogin'" @keyup.enter.native="loginHandleClick">
+									<a-form ref="loginRef" :model="formData" v-if="activeIndex === 'accountLogin'"
+										@keyup.enter.native="loginHandleClick">
 										<div class="aui-account">
 											<div class="aui-inputClear">
 												<a-row>
 													<a-col :span="2">
-                            <span style="margin-top: 10px;display: block;"><img :src="icon1Img" alt="账号" style="width: 20px;" /></span>
+														<span style="margin-top: 13px;display: block;"><img
+																:src="icon1Img" alt="账号" style="width: 20px;" /></span>
 													</a-col>
 													<a-col :span="20">
 														<a-form-item>
-                              <a-input class="fix-auto-fill" :placeholder="`请输入`+t('sys.login.userName')" v-model:value="formData.username" />
+															<a-input class="fix-auto-fill"
+																:placeholder="`请输入`+t('sys.login.userName')"
+																v-model:value="formData.username" />
 														</a-form-item>
 													</a-col>
 												</a-row>
@@ -44,11 +48,14 @@
 											<div class="aui-inputClear">
 												<a-row>
 													<a-col :span="2">
-                            <span style="margin-top: 10px;display: block;"><img :src="icon2Img" alt="密码" style="width: 20px;" /></span>
+														<span style="margin-top: 13px;display: block;"><img
+																:src="icon2Img" alt="密码" style="width: 20px;" /></span>
 													</a-col>
 													<a-col :span="20">
 														<a-form-item>
-                              <a-input class="fix-auto-fill" type="password" :placeholder="`请输入`+t('sys.login.password')" v-model:value="formData.password" />
+															<a-input class="fix-auto-fill" type="password"
+																:placeholder="`请输入`+t('sys.login.password')"
+																v-model:value="formData.password" />
 														</a-form-item>
 													</a-col>
 												</a-row>
@@ -79,7 +86,8 @@
 								</div>
 								<div class="aui-formButton">
 									<div class="aui-flex">
-                    <a-button :loading="loginLoading" class="aui-link-login" type="primary" @click="loginHandleClick">
+										<a-button :loading="loginLoading" class="aui-link-login" type="primary"
+											@click="loginHandleClick">
 											{{ t('sys.login.loginButton') }}</a-button>
 									</div>
 								</div>
@@ -395,6 +403,7 @@
 	:deep(.ant-input:focus) {
 		box-shadow: none;
 	}
+
 	.aui-get-code {
 		float: right;
 		position: relative;
@@ -421,6 +430,7 @@
 		position: absolute;
 		margin-right: 10px;
 	}
+
 	.aui-link-login {
 		height: 42px;
 		padding: 10px 15px;
@@ -431,6 +441,7 @@
 		flex: 1;
 		color: #fff;
 	}
+
 	.aui-phone-logo {
 		position: absolute;
 		margin-left: 10px;
@@ -438,9 +449,13 @@
 		top: 4%;
 		z-index: 4;
 	}
+
 	.top-3 {
 		top: 0.45rem;
 	}
+	.ant-form-item {
+	  margin-bottom: 0px !important;
+	}
 </style>
 
 <style lang="less">
@@ -455,9 +470,11 @@ html[data-theme='dark'] {
 			&::before {
 				background-image: url(/@/assets/svg/login-bg-dark.svg);
 			}
+
 			.aui-inputClear {
 				background-color: #232a3b !important;
 			}
+
 			.ant-input,
 			.ant-input-password {
 				background-color: #232a3b !important;
@@ -474,16 +491,21 @@ html[data-theme='dark'] {
 			.app-iconify {
 				color: #fff !important;
 			}
-    .aui-inputClear input,.aui-input-line input,.aui-choice{
+
+			.aui-inputClear input,
+			.aui-input-line input,
+			.aui-choice {
 				color: #c9d1d9 !important;
 			}
 
 			.aui-formBox {
 				background-color: @dark-bg !important;
 			}
+
 			.aui-third-text span {
 				background-color: @dark-bg !important;
 			}
+
 			.aui-form-nav .aui-flex-box {
 				color: #c9d1d9 !important;
 			}
@@ -492,12 +514,16 @@ html[data-theme='dark'] {
 				background: @dark-bg !important;
 				color: white !important;
 			}
+
 			.aui-code-line {
 				border-left: none !important;
 			}
-    .ant-checkbox-inner,.aui-success h3{
+
+			.ant-checkbox-inner,
+			.aui-success h3 {
 				border-color: #c9d1d9;
 			}
+
 			//update-begin---author:wangshuai ---date:20230828  for：【QQYUN-6363】这个样式代码有问题，不在里面，导致表达式有问题------------
 			&-sign-in-way {
 				.anticon {
@@ -510,6 +536,7 @@ html[data-theme='dark'] {
 					}
 				}
 			}
+
 			//update-end---author:wangshuai ---date:20230828  for：【QQYUN-6363】这个样式代码有问题，不在里面，导致表达式有问题------------
 		}
 
@@ -523,10 +550,12 @@ html[data-theme='dark'] {
 			font-size: 12px !important;
 			color: @text-color-secondary !important;
 		}
+
 		.aui-third-login a {
 			background: transparent;
 		}
 	}
+
 	/* Chrome/Edge/Safari */
 	input:-webkit-autofill,
 	input:-webkit-autofill:hover,