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

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.196",
-    "versionCode" : 21196,
+    "versionName" : "2.1.199",
+    "versionCode" : 21199,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages/task/audit/charge_against_revenue.vue

@@ -82,8 +82,10 @@
 			</view>
 			<view style='border-bottom: 0;' class="row">
 				<view class="left">备注</view>
-				<view class="right">{{auditInfo.remark}}</view>
+				<!-- <view class="right">{{auditInfo.remark}}</view> -->
 			</view>
+			<textarea class='textarea' autoHeight v-model="auditInfo.remark" input-align="right" placeholder="暂无备注信息"
+				disabled />
 			<!-- <view class="row">
 				<view class="left">附件</view>
 				<view class="right">{{auditInfo.amountMoney}}</view>
@@ -1238,7 +1240,15 @@
 		border-right: 1px solid #eee;
 		color: #AFB3BF;
 	}
-
+.textarea {
+		margin: 18rpx auto;
+		width: 100%;
+		background: #F9F9FA;
+		border-radius: 10px;
+		border: 1px solid #EEEEEE;
+		font-size: 28rpx;
+		padding: 10px;
+	}
 	.u-textarea-style {
 		margin: 20rpx;
 		background: #F9F9FA;

pages/task/audit/charge_against_revenue_detail.vue

@@ -82,8 +82,10 @@
 			</view>
 			<view style='border-bottom: 0;' class="row">
 				<view class="left">备注</view>
-				<view class="right">{{auditInfo.remark}}</view>
+				<!-- <view class="right">{{auditInfo.remark}}</view> -->
 			</view>
+			<textarea class='textarea' autoHeight v-model="auditInfo.remark" input-align="right" placeholder="暂无备注信息"
+				disabled />
 			<!-- <view class="row">
 				<view class="left">附件</view>
 				<view class="right">{{auditInfo.amountMoney}}</view>
@@ -1090,7 +1092,15 @@
 	// 	text-overflow: ellipsis;
 	// 	word-break: break-all;
 	// }
-
+.textarea {
+		margin: 18rpx auto;
+		width: 100%;
+		background: #F9F9FA;
+		border-radius: 10px;
+		border: 1px solid #EEEEEE;
+		font-size: 28rpx;
+		padding: 10px;
+	}
 	.img_item {
 		display: flex;
 		width: 85vw;