Merge branch 'master' of http://git.zthymaoyi.com/wangchao/businessCard

xiaochengxu/pages/mySet/editHome.vue

@@ -9,13 +9,13 @@
 					<view class="">
 						公司/机构简介
 					</view>
-					<u--textarea v-model="value2" placeholder="输入公司/机构简介,不超过1000个字" count ></u--textarea>
+					<u--textarea v-model="value2" placeholder="输入公司/机构简介,不超过1000个字" count maxlength="1000"></u--textarea>
 				</view>
 				<view class="">
 					<view class="">
 						业务范围
 					</view>
-					<u--textarea v-model="value2" placeholder="输入业务范围,不超过500个字" count ></u--textarea>
+					<u--textarea v-model="value2" placeholder="输入业务范围,不超过500个字" count maxlength="500"></u--textarea>
 				</view>
 				<u-form-item label="公司地址" prop="userInfo.name" borderBottom ref="item1">
 					<u--input v-model="homeInfo.name" border="none" placeholder="输入地址"></u--input>

xiaochengxu/pages/mySet/myHome.vue

@@ -40,7 +40,7 @@
 			<view class="intro top-m">
 				<view v-if='editstatus' class="row">公司/机构简介</view>
 				<view v-else class="title">基本信息</view>
-				<u--textarea v-if='editstatus' v-model="companyData.companyIntroduction" count placeholder="请输入公司/机构简介，不超过1000个字"></u--textarea>
+				<u--textarea v-if='editstatus' v-model="companyData.companyIntroduction" count placeholder="请输入公司/机构简介，不超过1000个字" maxlength="1000"></u--textarea>
 				
 				<view class='content' v-else>{{companyData.companyIntroduction}}</view>
 			</view>
@@ -84,12 +84,12 @@
 				
 			<view v-if='editstatus' class="row flex flex-between align-item-center line top-m">
 				<view class='input-title'>联系电话</view>
-				<u--input v-model="companyData.phone" type='number' placeholder="输入联系电话" maxlength='15' border="none" inputAlign='right'></u--input>
+				<u--input v-model="companyData.phone" placeholder="输入联系电话" maxlength='15' border="none" inputAlign='right'></u--input>
 			</view>
 				
 			<view v-if='editstatus' class="row flex flex-between align-item-center line top-m">
 				<view  class='input-title'>传真</view>
-				<u--input v-model="companyData.portraiture" placeholder="输入传真号" type='number'  border="none" inputAlign='right'></u--input>
+				<u--input v-model="companyData.portraiture" placeholder="输入传真号" border="none" inputAlign='right'></u--input>
 			</view>
 				
 			<view v-if='editstatus' class="row flex flex-between align-item-center line top-m">