Merge branch 'master' of https://git.citupro.com/zhengnaiwen_citu/menduner-uniapp

components/searchCombox/index.vue

@@ -237,14 +237,13 @@
 		font-weight: 300;
 		font-size: 28upx;
 		background-color: #fff;
-		border: #c6adad solid 2upx;
-		border-radius: 6upx;
-		padding: 12upx 20upx;
+		// border: #e5e5e5 solid 2upx;
+		border: 1px solid #e5e5e5;
+		border-radius: 5px;
+		padding: 0 10px;
 		position: relative;
-		/* #ifndef APP-NVUE */
 		display: flex;
-		/* #endif */
-		// height: 40px;
+		height: 35px;
 		flex-direction: row;
 		align-items: center;
 		// border-bottom: solid 1px #DDDDDD;
@@ -269,13 +268,13 @@
 
 	.uni-combox__input {
 		flex: 1;
-		font-size: 28upx;
-		height: 22px;
-		line-height: 22px;
+		font-size: 14px;
+		// height: 22px;
+		// line-height: 22px;
 	}
 
 	.uni-combox__input-plac {
-		font-size: 14px;
+		font-size: 13px;
 		color: grey;
 		font-weight: 300;
 	}

layout/components/authModal/selectUserType/studentInfoForm.vue

@@ -48,7 +48,6 @@
         </uni-forms-item>
         <uni-forms-item name="schoolClassId" label="所在班级" required>
           <searchComBox ref="schoolClassIdRef" v-model="formData.schoolClassId" :candidates="classList" itemTextName='schoolClassName' itemValueName='schoolClassId' labelKey='name' valueKey='id' placeholder="请选择所在班级"></searchComBox>
-
         </uni-forms-item>
         <uni-forms-item name="studentNo" label="学号" required>
           <uni-easyinput placeholder="请填写学号" v-model="formData.studentNo" :inputBorder="false" type="text"></uni-easyinput>