Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/task/audit/acquisitioncontract.vue

@@ -82,7 +82,7 @@
 			<u-form-item label-width='260' label="备注信息" :borderBottom="false">
 			</u-form-item>
 			<u-form-item>
-				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="暂无备注信息" disabled />
+				<textarea class='textarea' autoHeight v-model="list.remarks" input-align="right" placeholder="暂无备注信息" disabled />
 			</u-form-item>
 			
 			<!-- <u-form-item label-width='260' label="附件"> -->

pages/task/audit/purchasecontract.vue

@@ -111,7 +111,7 @@
 			<u-form-item label-width='260' label="备注信息" :borderBottom="false">
 			</u-form-item>
 			<u-form-item>
-				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="暂无信息" disabled />
+				<textarea class='textarea' autoHeight v-model="list.remarks" input-align="right" placeholder="暂无信息" disabled />
 			</u-form-item>
 			<!-- <u-form-item label-width='260' label="附件"> -->
 				<!-- <view class="textCss">

pages/task/audit/salecontract.vue

@@ -109,7 +109,7 @@
 			</u-form-item>
 			<!-- <view class="form_top">备注信息</view> -->
 			<u-form-item>
-				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="暂无备注信息" disabled />
+				<textarea class='textarea' autoHeight v-model="list.remarks" input-align="right" placeholder="暂无备注信息" disabled />
 			</u-form-item>
 		</u-form>
 		<u-form ref="uForm">