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

pageB/contract/contract.vue

@@ -223,7 +223,7 @@
 			},
 			commit1(item) {
 				uni.navigateTo({
-					url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&customer=${item.customer}&goodsName=${item.goodsName}`
+					url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&contracter=${item.contracter}&goodsName=${item.goodsName}`
 				})
 			},
 			commit2(item) {

pageB/contract/look.vue

@@ -13,7 +13,7 @@
 				<view class="c-row b-b">
 					<text class="tit">买方名称:</text>
 					<view class="con-list">
-						<text>{{goods.customer}}</text>
+						<text>{{goods.contracter}}</text>
 					</view>
 				</view>
 				<view class="c-row">
@@ -147,7 +147,7 @@
 		},
 		onLoad(option) {
 			this.goods.goodsName = option.goodsName
-			this.goods.customer = option.customer
+			this.goods.contracter = option.contracter
 			this.id = option.id
 			this.planId=option.planId
 			this.goods.contractNo = option.contractNo

pageD/warehousings/warehousings.vue

@@ -295,7 +295,6 @@ import upload from '@/components/upload.vue';
 				month="0"+(month+1)
 			}
 			this.time = year+'-'+month+"-"+date1
-			 this.getList(this.WarehouseInOutInfo.id)
 		},
 		methods: {
 			getList(id1){

pages/release/release.vue

@@ -17,7 +17,12 @@
 					<view class="address">{{item.privates}}{{item.city}}{{item.Area}}</view>
 					<view class="flex ">
 						<view class="weight">{{item.plannedVolume > 0 ? item.plannedVolume : 0}}吨</view>
-						<text class="unitPrice">{{item.unitPrice}} <text class="amount">元/吨</text></text>
+						<view v-if='item.planType=="期货"'>
+							<text class="unitPrice">{{item.basisPrice}} <text class="amount">元/吨</text></text>
+						</view>
+						<view v-if='item.planType=="现货"'>
+							<text class="unitPrice">{{item.unitPrice}} <text class="amount">元/吨</text></text>
+						</view>
 					</view>
 				</view>
 				<hr style="margin: 16px 0; color: #EEEEEE;">