Merge branch 'master' of http://git.zthymaoyi.com/zhongtianhaoyuan/unimall

unimall-app/pageB/contract/contract.vue

@@ -43,12 +43,12 @@
 							<view v-if='item.tradeStatus==2' class='flex justify-between'>
 								<text style='display:inline-block;margin-right:5px;' v-if="item.price">暂定价：{{item.price}}</text>
 								<text style='display:inline-block;margin-right:5px;' v-if="item.basis">基差：{{item.basis}}</text>  
-								<text style='display:inline-block;margin-right:5px;' v-if="item.basis">吨位：{{item.basis}}</text>  
+								<text style='display:inline-block;margin-right:5px;' v-if="item.allCount">吨位：{{item.allCount}}T</text>  
 							</view>
 							<view v-else class='flex justify-between'>
 								<text style='display:inline-block;margin-right:5px;' v-if="item.price">成交价：{{item.price}}</text>
 								<text style='display:inline-block;margin-right:5px;' v-if="item.basis">基差：{{item.basis}}</text>  
-								<text style='display:inline-block;margin-right:5px;' v-if="item.basis">吨位：{{item.basis}}</text>  
+								<text style='display:inline-block;margin-right:5px;' v-if="item.allCount">吨位：{{item.allCount}}T</text>  
 							</view>
 							<view class='flex button-group'><button @click="navToDetailPage2(item)">操作</button><button  @click="examine(item)">查看</button></view>
 							<!-- <view class='flex justify-between' v-if="item.contractType == '采购合同'">