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

pageA/product/detail.vue

@@ -10,7 +10,7 @@
 				<view class='flex justify-between'>
 					<view style='flex:1.5;color:#878C9C;'>{{goods.receivePrivate}}{{goods.receiveCity}}{{goods.receiveArea}}{{goods.receiveWarehouse}}</view>
 					<view  v-if='goods.procurementPlanType=="现货"' class="title-tip">
-						<text class="price">{{goods.unitPrice}}</text>
+						<text class="price">{{goods.procurementPrice}}</text>
 					</view>
 					<view style='text-align:right;'  v-else class="title-tip">
 						{{goods.basisPrice}}

pageD/myRelease/buyDetails.vue

@@ -51,7 +51,7 @@
 		<view class="c-row b-b" v-if="procurementPlanInfos.procurementPlanType == '现货'">
 			<text class="tit">单价（元/吨）</text>
 			<view class="con-list">
-				{{procurementPlanInfos.unitPrice}}
+				{{procurementPlanInfos.procurementPrice}}
 			</view>
 		</view>
 		<view class="c-row b-b" v-if="procurementPlanInfos.procurementPlanType == '期货'">

pageD/myRelease/buyGrain.vue

@@ -49,7 +49,7 @@
 			<view class="c-row b-b" v-if="this.typesIndex != 1">
 				<text class="tit">单价（元/吨）</text>
 				<view class="con-list">
-					<input placeholder="请填写单价" name="input" v-model="deptList.unitPrice"></input>
+					<input placeholder="请填写单价" name="input" v-model="deptList.procurementPrice"></input>
 				</view>
 			</view>
 			<view class="c-row b-b" v-if="this.typesIndex == 1">
@@ -442,16 +442,16 @@
 					return
 				}
 				if (this.deptList.procurementPlanType == '现货') {
-					if (!this.deptList.unitPrice) {
+					if (!this.deptList.procurementPrice) {
 						this.$api.msg('单价不能为空')
 						return
 					}
-					if (this.deptList.unitPrice > 100000 || this.deptList.unitPrice < 1) {
+					if (this.deptList.procurementPrice > 100000 || this.deptList.procurementPrice < 1) {
 						this.$api.msg('单价输入错误')
 						return
 					}
-					if (this.deptList.unitPrice.indexOf('.') != -1) {
-						if (this.deptList.unitPrice.split('.')[1].length > 2) {
+					if (this.deptList.procurementPrice.indexOf('.') != -1) {
+						if (this.deptList.procurementPrice.split('.')[1].length > 2) {
 							this.$api.msg('单价输入错误')
 							return
 						}