Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51 into master

pages/index/index.vue

@@ -56,7 +56,7 @@
 
 		<!-- 模式选择 -->
 
-		<u-mask :show="show=false">
+		<u-mask :show="show">
 
 			<view class="wrap">
 
@@ -326,7 +326,8 @@
 					this.show = true;
 				}
 			}else{
-				this.carhelp.set("getElderModeClass", "标准模式");
+				this.carhelp.set("getElderModeClass", "长辈模式");
+				this.elderStatus = true;
 				
 				var obj=this.carhelp.get("friends_invitation")
 				// this.carhelp.set("friends_invitation",{

pages/login/login.vue

@@ -235,6 +235,7 @@
 					var token = response ? response.data.token : '';
 					this.carhelp.setToken(token);
 					this.carhelp.setPersonInfo(response.data.regUser);
+					this.carhelp.set("getElderModeClass", false);
 					if(!response.data.regUser.carId){
 						var url="/pages/login/completeInfo?login=1"
 						

pages/user/freeInstallment.vue

@@ -32,7 +32,7 @@
 				</view>
 				<view class="place">
 					<p>安装地点</p>
-					<textarea v-model="address" class="textarea" placeholder="填写详细位置"></textarea>
+					<u-input class="textarea" type="textarea" height="200"  v-model="address" placeholder="填写详细位置" ></u-input>
 				</view>
 				<view class="type">
 					<p>场地类型</p>
@@ -358,7 +358,10 @@
 			
 		  }
 		  /deep/.uni-input-input{
-			  margin-left: 10px;
+			  margin: 20px;
+		  }
+		  /deep/.u-input__right-icon{
+			  margin-right: 10px;
 		  }
 		  p{
 			  @include themeify{
@@ -381,6 +384,7 @@
 			  border-radius: 22px;
 			  background-color: rgba(232, 236, 234, 100);
 			   margin-top: 12px;
+			   overflow: auto;
 			   @include themeify{
 			    	font-size: themed('font-size2');
 			    	line-height: themed('font-size2'); 
@@ -393,7 +397,7 @@
    				}
 			 }
 			 /deep/.uni-textarea-textarea{
-				 margin: 10px;
+				 margin: 10px 20px;
 			 }
 		  }
 	}

pages/user/toJoin.vue

@@ -27,7 +27,8 @@
  				</view>
 				<view class="place">
 					<p>自有电桩地点</p>
-					<textarea class="textarea" v-model="address" placeholder="填写详细位置"></textarea>
+				
+					<u-input class="textarea"  type="textarea" height="200"  v-model="address" placeholder="填写详细位置" ></u-input>
 				</view>
 				<view class="type">
 					<p>场地类型</p>
@@ -365,9 +366,12 @@
 				  margin-top: 12px;
 				
 			  }
-			  /deep/.uni-input-input{
-				  margin-left: 10px;
-			  }
+			 /deep/.uni-input-input{
+			 			  margin: 20px;
+			 }
+			 /deep/.u-input__right-icon{
+			 			  margin-right: 10px;
+			 }
 			  p{
 				  @include themeify{
 				  	font-size: themed('font-size4');
@@ -388,21 +392,27 @@
 				  height: 100px;
 				  border-radius: 22px;
 				  background-color: rgba(232, 236, 234, 100);
+				overflow: auto;	
+			
 				   margin-top: 12px;
 				  @include themeify{
 				  	font-size: themed('font-size2');
 				  	line-height: themed('font-size2');
 				  } 
 				 .uni-textarea-placeholder{
+				
 					 padding: 12px;
+					
 					 @include themeify{
 					 	font-size: themed('font-size2');
 					 	line-height: themed('font-size2');
  					 }
 				 }
 				 /deep/.uni-textarea-textarea{
-					 margin: 10px;
+					 padding: 10px 20px;
+					  
 				 }
+				
 			  }
 			  .type{
 			  	.checkbox{