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

pageA/product/sales_detail.vue

@@ -10,7 +10,7 @@
 				<view class='flex justify-between'>
 					<view style='flex:1.5;color:#878C9C;'>{{goods.sendPrivate}}{{goods.sendCity}}{{goods.sendArea}}{{goods.sendWarehouse}}</view>
 					<view  v-if='goods.salePlanType=="现货"' class="title-tip">
-						<text class="price">{{goods.unitPrice}}</text>
+						<text class="price">{{goods.salePrice}}</text>
 					</view>
 					<view style='text-align:right;'  v-else class="title-tip">
 						{{goods.basisPrice}}
@@ -83,7 +83,7 @@
 				<view class="c-row" v-if="goods.salePlanType == '现货'">
 					<text class="tit">销售价格（元/吨）</text>
 					<view class="con-list">
-						<text>{{goods.unitPrice}}</text>
+						<text>{{goods.salePrice}}</text>
 					</view>
 				</view>
 				<view class="c-row">

pageD/myRelease/sellEdit.vue

@@ -402,16 +402,16 @@
 					return
 				}
 				if (this.deptList.salePlanType == '现货') {
-					if (!this.deptList.unitPrice) {
+					if (!this.deptList.salePrice) {
 						this.$api.msg('单价不能为空')
 						return
 					}
-					if (this.deptList.unitPrice > 100000 || this.deptList.unitPrice < 1) {
+					if (this.deptList.salePrice > 100000 || this.deptList.salePrice < 1) {
 						this.$api.msg('单价输入错误')
 						return
 					}
-					if (this.deptList.unitPrice.indexOf('.') != -1) {
-						if (this.deptList.unitPrice.split('.')[1].length > 2) {
+					if (this.deptList.salePrice.indexOf('.') != -1) {
+						if (this.deptList.salePrice.split('.')[1].length > 2) {
 							this.$api.msg('单价输入错误')
 							return
 						}

pageD/myRelease/sellGrain.vue

@@ -449,16 +449,16 @@
 					return
 				}
 				if (this.deptList.salePlanType == '现货') {
-					if (!this.deptList.unitPrice) {
+					if (!this.deptList.salePrice) {
 						this.$api.msg('单价不能为空')
 						return
 					}
-					if (this.deptList.unitPrice > 100000 || this.deptList.unitPrice < 1) {
+					if (this.deptList.salePrice > 100000 || this.deptList.salePrice < 1) {
 						this.$api.msg('单价输入错误')
 						return
 					}
-					if (this.deptList.unitPrice.indexOf('.') != -1) {
-						if (this.deptList.unitPrice.split('.')[1].length > 2) {
+					if (this.deptList.salePrice.indexOf('.') != -1) {
+						if (this.deptList.salePrice.split('.')[1].length > 2) {
 							this.$api.msg('单价输入错误')
 							return
 						}

pages/business/business.vue

@@ -43,11 +43,11 @@
 					</view>
 					<view class='price' v-if='item.procurementPlanType=="期货"'>{{item.basisPrice}}<text
 							style='font-size:13px;color:#333333;'>元/吨</text></view>
-					<view class='price' v-if='item.procurementPlanType=="现货"'>{{item.unitPrice}}<text
+					<view class='price' v-if='item.procurementPlanType=="现货"'>{{item.procurementPrice}}<text
 							style='font-size:13px;color:#333;'>元/吨</text></view>
 					<view class='price' v-if='item.salePlanType=="期货"'>{{item.basisPrice}}<text
 						style='font-size:13px;color:#333333;'>元/吨</text></view>
-					<view class='price' v-if='item.salePlanType=="现货"'>{{item.unitPrice}}<text
+					<view class='price' v-if='item.salePlanType=="现货"'>{{item.salePrice}}<text
 						style='font-size:13px;color:#333;'>元/吨</text></view>
 				</view>
 				<view class='flex justify-between'>