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

# Conflicts:
#	config/index.js
#	pages/task/audit/purchasecontract.vue

manifest.json

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

pages/reimbursement/the_reimbursement.vue

@@ -101,6 +101,7 @@
 					pageSize: this.pageSize,
 					currentPage: this.currentPage,
 					compId: uni.getStorageSync('pcUserInfo').compId,
+					createUserId : uni.getStorageSync('userInfo').id
 				}).then(res => {
 					if (res.data.code == 200) {
 						uni.hideLoading()

pages/task/audit/purchasecontract.vue

@@ -96,6 +96,7 @@
 			</view>
 			<u-form-item label-width='260' label="买方" :borderBottom="false">
 				<u-input v-model="list.buyer" input-align="right" placeholder="--" disabled />
+
 			</u-form-item>
 			<u-form-item label-width='260' label="买方电话" :borderBottom="false">
 				<u-input v-model="list.buyerPhone" input-align="right" placeholder="--" disabled />
@@ -114,6 +115,7 @@
 			</u-form-item>
 			<u-form-item label-width='260' label="交货日期（止）" :borderBottom="false">
 				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="--" disabled />
+
 			</u-form-item>
 			<u-form-item label-width='260' label="合同单价（元/吨）" :borderBottom="false">
 				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
@@ -604,7 +606,8 @@
 	.u-form {
 		background: #fff;
 		border-radius: 10px;
-		padding: 30rpx 10px;
+		padding: 0 10px;
+
 		.u-form-item {
 			line-height: 30px;
 			padding: 0px 0;