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

pages/user/freeInstallment.vue

@@ -3,7 +3,7 @@
 		<u-navbar title="免费安桩" :is-back="back" ></u-navbar>
 	    <view class="main">
 			<view class="text">
-				        为响应政府号召，积极推动充电桩普及，“51充电联盟”现面向公共停车场、私家车位提供“免费安桩”服务，有意加盟“51充电联盟”的机构和个人，均可申请免费安装电动汽车/摩托车/自行车充电桩，在平台的运营支持下，共享风口红利。
+				     为响应政府号召，积极推动充电桩普及，“51充电联盟”现面向公共停车场、私家车位提供“免费安桩”服务，有意加盟“51充电联盟”的机构和个人，均可申请免费安装电动汽车/摩托车/自行车充电桩，在平台的运营支持下，共享风口红利。
 			</view>
 	    	<view class="suited">
 	    		<p class="title">适合对象 :</p>
@@ -32,7 +32,7 @@
 				</view>
 				<view class="place">
 					<p>安装地点</p>
-					<u-input class="textarea" type="textarea" height="200"  v-model="address" placeholder="填写详细位置" ></u-input>
+					<u-input class="textarea" type="textarea"  height="200"  v-model="address" placeholder="填写详细位置" ></u-input>
 				</view>
 				<view class="type">
 					<p>场地类型</p>
@@ -68,7 +68,7 @@
 				</view>
 			      <view class="hint">
 			      	*请保持手机畅通，我们将安排专人与您联系。您也可以拨打 
-					 <text class="tel-num"  @click="calltel('400-8899-619')" >400-8899-619</text>查询申请审核进度！
+					 <text class="tel-num">400-8899-619</text>查询申请审核进度！
 			      </view>
 				 <u-button type="warning" @click="submit" >提交申请</u-button>
 			</view>
@@ -141,11 +141,7 @@
 				}
 			},
 			methods:{
-				calltel(tel){
-					uni.makePhoneCall({
-						phoneNumber:tel //仅为示例
-					});
-				},
+				
 				submit(){
 				
 					var obj=[]
@@ -384,11 +380,11 @@
 		  }
 		  .textarea{
 			  width: 72.2vw;
-			  height: 100px;
+			  height: 140px;
 			  border-radius: 22px;
 			  background-color: rgba(232, 236, 234, 100);
 			   margin-top: 12px;
-			   overflow: auto;
+			 overflow-y: scroll;
 			   @include themeify{
 			    	font-size: themed('font-size2');
 			    	line-height: themed('font-size2'); 
@@ -400,9 +396,14 @@
 				 	line-height: themed('font-size2'); 
    				}
 			 }
-			 /deep/.uni-textarea-textarea{
-				 margin: 10px 20px;
-			 }
+			/deep/.uni-textarea-textarea{
+								 width: 90%;
+								 padding: 10px 20px;
+								  
+			}
+			/deep/.u-input__right-icon {
+								 display: none;
+			}
 		  }
 	}
 	.type{

pages/user/logout.vue

@@ -45,18 +45,12 @@
 			  if(type == 'elder')	
 			  {
 				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
-				 let data = {
-				 	"font-size":'32rpx', 
-				 	};
-				 this.placeholderStyle = data;
+				 
 			  }
 			  else
 			  {
 				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
-				 let data = {
-				 	"font-size":'28rpx'
-				 	};
-				 this.placeholderStyle = data;
+				  
 			  } 
 			},
 			toSetting() {

pages/user/message.vue

@@ -5,7 +5,7 @@
 			<view class="message-form">
 				<u-form :model="subForm" ref="uForm" label-width ="100">
 					<u-form-item label-width="0">
-							<u-input :customStyle="placeholderStyle" :placeholderStyle="placeholderStyle" v-model="subForm.content" type="textarea"  placeholder="请描述您的意见" height="200"/>
+							<u-input :customStyle="customStyle" :placeholderStyle="placeholderStyle" v-model="subForm.content" type="textarea"  placeholder="请描述您的意见" height="200"/>
 					</u-form-item>
 					<u-form-item label-width="0">
 						<view class="upload">
@@ -16,7 +16,7 @@
 						</view>
 					</u-form-item>
 					<u-form-item >
-						<u-input :customStyle="placeholderStyle"  :placeholderStyle="placeholderStyle" v-model="subForm.telephone" placeholder="请留下联系方式，方便我们与您取得联系（必填）" />
+						<u-input :customStyle="customStyle"  :placeholderStyle="placeholderStyle" v-model="subForm.telephone" placeholder="请留下联系方式，方便我们与您取得联系（必填）" />
 					</u-form-item>
 				</u-form>
 			</view>
@@ -33,9 +33,10 @@
 		data() {
 			return {
 				elderMode:false,
-				placeholderStyle:{
+				customStyle:{
 					'font-size':'28rpx'
 				},
+				placeholderStyle:"font-size:28rpx", 
 				isReady:false,
 				imgBase64: '',
 				listPic: [],
@@ -87,7 +88,8 @@
 			 	 let data = {
 			 	 	"font-size":'32rpx',
 			 	 	};
-			 	 this.placeholderStyle = data;
+			 	this.customStyle = data;
+			 	this.placeholderStyle = "font-size:32rpx";//data;
 			   }
 			   else
 			   {
@@ -95,7 +97,8 @@
 			 	 let data = {
 			 	 	"font-size":'28rpx'
 			 	 	};
-			 	 this.placeholderStyle = data;
+			 	 this.customStyle = data;
+			 	 this.placeholderStyle = "font-size:28rpx";//data;
 			   } 
 			 },
 			//微信选择图片

pages/user/phone.vue

@@ -4,12 +4,12 @@
 		<view class="login-form">
 			<view class="login-form-item">
 				<view class="input">
-					<u-input :customStyle="placeholderStyle" :placeholderStyle="placeholderStyle" v-model="form.telephone" type="number" placeholder="请输入手机号" placeholder-style="font-size:16px;color:#ccc;"/>
+					<u-input :customStyle="customStyle" :placeholderStyle="placeholderStyle" v-model="form.telephone" type="number" placeholder="请输入手机号" placeholder-style="font-size:16px;color:#ccc;"/>
 				</view>
 			</view>
 			<view class="login-form-item">
 				<view class="input">
-					<u-input :customStyle="placeholderStyle" :placeholderStyle="placeholderStyle" v-model="form.verifyCode" type="number" placeholder="请输入验证码" placeholder-style="font-size:16px;color:#ccc;"/>
+					<u-input :customStyle="customStyle" :placeholderStyle="placeholderStyle" v-model="form.verifyCode" type="number" placeholder="请输入验证码" placeholder-style="font-size:16px;color:#ccc;"/>
 					<view class="code" @click="getCode">{{codeTips}}</view>
 				</view>
 			</view>
@@ -33,9 +33,10 @@
 		data() {
 			return {
 				elderMode:false,
-				placeholderStyle:{
+				customStyle:{
 					'font-size':'28rpx'
 				},
+				placeholderStyle:"font-size:28rpx",
 				form: {
 					telephone: '',
 					verifyCode: '',
@@ -146,7 +147,8 @@
 				 let data = {
 				 	"font-size":'32rpx', 
 				 	};
-				 this.placeholderStyle = data;
+				 this.customStyle = data;
+				 this.placeholderStyle = "font-size:32rpx";//data;
 			  }
 			  else
 			  {
@@ -154,7 +156,8 @@
 				 let data = {
 				 	"font-size":'28rpx'
 				 	};
-				 this.placeholderStyle = data;
+				this.customStyle = data;
+				this.placeholderStyle = "font-size:28rpx";//data;
 			  } 
 			}
 		}, 

pages/user/toJoin.vue

@@ -19,11 +19,11 @@
 				<view class="name">
 					<p>申请人姓名</p>
 
-					<u-input   v-model="name" :customStyle="placeholderStyle" :placeholderStyle="placeholderStyle" placeholder=""></u-input>
+					<u-input   v-model="name" :customStyle="customStyle" :placeholderStyle="placeholderStyle" placeholder=""></u-input>
 				</view>
 				<view class="tel">
 					<p>联系电话</p>
-					<u-input :customStyle="placeholderStyle"  v-model="subForm.phone" :placeholderStyle="placeholderStyle" placeholder=""></u-input>
+					<u-input :customStyle="customStyle"  v-model="subForm.phone" :placeholderStyle="placeholderStyle" placeholder=""></u-input>
  				</view>
 				<view class="place">
 					<p>自有电桩地点</p>
@@ -98,9 +98,10 @@
 						content:""
 					},
 					elderMode:false,
-					placeholderStyle:{
+					customStyle:{
 						'font-size':'28rpx'
 					},
+					placeholderStyle:"font-size:28rpx",
 					typeList: [
 									{
 										name: '电动汽车充电桩（快充）',
@@ -280,7 +281,8 @@
 					 let data = {
 					 	"font-size":'32rpx', 
 					 	};
-					 this.placeholderStyle = data;
+					this.customStyle = data;
+					this.placeholderStyle = "font-size:32rpx";//data;
 				  }
 				  else
 				  {
@@ -288,7 +290,8 @@
 					 let data = {
 					 	"font-size":'28rpx'
 					 	};
-					 this.placeholderStyle = data;
+					this.customStyle = data;
+					this.placeholderStyle = "font-size:28rpx";//data;
 				  } 
 				}
 			},
@@ -394,10 +397,10 @@
 			  }
 			  .textarea{
 				  width: 72.2vw;
-				  height: 100px;
+				  height: 140px;
 				  border-radius: 22px;
 				  background-color: rgba(232, 236, 234, 100);
-				overflow: auto;	
+			      overflow-y: scroll;
 			
 				   margin-top: 12px;
 				  @include themeify{
@@ -414,9 +417,13 @@
  					 }
 				 }
 				 /deep/.uni-textarea-textarea{
+					 width: 90%;
 					 padding: 10px 20px;
 					  
 				 }
+				 /deep/.u-input__right-icon {
+					 display: none;
+				 }
 				
 			  }
 			  .type{