Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-xqjy

pages/user/edit.vue

@@ -146,7 +146,7 @@
 		</view>
 		<view>
 			
-			<u-popup  border-radius="20" v-model="showSelfEvaluation" @close="close"   mode="bottom" length="90%" height="600rpx">
+			<u-popup  border-radius="20" v-model="showSelfEvaluation" @close="close"   mode="center" length="90%" height="600rpx">
 				<view style="display: flex; flex-direction: column;">
 					<view style="display:flex;flex-direction:row;margin-top: 50rpx;justify-content: space-between; ">
 						<view style="margin-left: 50rpx;font-weight: bold!important; font-size:30rpx;margin-bottom: 20rpx;">自我评价</view>

pagesB/pages/login/step1.vue

@@ -438,7 +438,6 @@
 	}
 
 	.jpLogin-input {
-		height: 48px;
 		background-color: #fff;
 		border: 1px solid #EEDCDC;
 		border-radius: 50px;
@@ -447,7 +446,7 @@
 		padding: 0 20px 0 30px;
 		margin-bottom: 20px;
 		.u-form-item{
-				   flex: 1;
+			flex: 1;
 		}
 		u-form-item{
 				width: 100%;

pagesB/pages/login/step2.vue

@@ -999,30 +999,35 @@
 		margin-top: 40px;
 	}
 	
-	.jpLogin-inputLabel{
+	.jpLogin-inputLabel{
+		margin-top: 40px;
 		u-form-item{
-				
-				transform: translateY(-30px);
-				
+			transform: translateY(-30px);	
+		}
+		.u-form-item{
+			flex: 1;
+			position: relative;
+			/deep/.u-form-item--left{
+				position: absolute;
+				top: -30px;
+			}
 		}
 	}
 	.jpLogin-input {
-		height: 48px;
-		background-color: #fff;
-		border: 1px solid #EEDCDC;
-		border-radius: 50px;
-		display: flex;
-		width: 100%;
-		padding: 0 20px;
-		margin-bottom: 20px;
+		// height: 48px;
+		background-color: #fff;
+		border: 1px solid #EEDCDC;
+		border-radius: 50px;
+		display: flex;
+		width: 100%;
+		padding: 0 20px;
+		margin-bottom: 20px;
 		position: relative;
 		.u-form-item{
-				   flex: 1;
+			flex: 1;
 		}
 		u-form-item{
 				width: 100%;
-			
-				
 		}
 		.jpLogin-icon{
 			font-size: 20px;

pagesB/pages/login/step3.vue

@@ -529,7 +529,7 @@
 	}
 
 	.jpLogin-input {
-		height: 48px;
+		// height: 48px;
 		background-color: #fff;
 		border: 1px solid #EEDCDC;
 		border-radius: 50px;